From 50a948152d76052845faf975059c02778db5bb9e Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Wed, 1 Feb 2012 17:52:26 +0000
Subject: [PATCH] [Remove] Killed my new/delete overloads in Character.h to
 stop KonoM from bitching at me.

---
 src/libUnuk/Engine/Character.h | 172 ++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/src/libUnuk/Engine/Character.h b/src/libUnuk/Engine/Character.h
index 333a9d6..232cdb0 100644
--- a/src/libUnuk/Engine/Character.h
+++ b/src/libUnuk/Engine/Character.h
@@ -21,108 +21,108 @@ class LevelGen;
 class Character {
 public:
 	Character(LevelGen* mapArg);
-  ~Character(void);
+	~Character(void);
 
-  void LoadSprites(string filename, int wArg, int hArg);
-  
-  float GetX(void)                   	{ return x; }
-  float GetY(void)                  	{ return y; }
-  float GetWidth(void)               	{ return w; }
-  float GetHeight(void)             	{ return h; }
-  
-  void SetXY(float xArg, float yArg)	{ x = xArg, y = yArg; }
-  void SetXVelocity(float arg)        { xVel = arg; }
-  void SetYVelocity(float arg)      	{ yVel = arg; }
+	void LoadSprites(string filename, int wArg, int hArg);
 
-  void SetHealth(int health)          { _health = health; }
-  int GetHealth(void)                 { return _health; }
-  
-  int  GetDirectionFacing(void)        { return directionFacing; }
-  void SetDirectionFacing(int dir)     { directionFacing = dir;  }
+	float GetX(void)                   	{ return x; }
+	float GetY(void)                  	{ return y; }
+	float GetWidth(void)               	{ return w; }
+	float GetHeight(void)             	{ return h; }
 
-  void AddSpeachBubble(string text);
+	void SetXY(float xArg, float yArg)	{ x = xArg, y = yArg; }
+	void SetXVelocity(float arg)        { xVel = arg; }
+	void SetYVelocity(float arg)      	{ yVel = arg; }
 
-  void Render(void);
-  void Update(void);
+	void SetHealth(int health)          { _health = health; }
+	int GetHealth(void)                 { return _health; }
 
-  void OnAttack(void);
+	int  GetDirectionFacing(void)        { return directionFacing; }
+	void SetDirectionFacing(int dir)     { directionFacing = dir;  }
 
-  inline void* operator new(size_t size) {
-    return gMemManager.Allocate(size);
-  }
+	void AddSpeachBubble(string text);
 
-  inline void operator delete(void* object) {
-    gMemManager.Free(object);
-  }
+	void Render(void);
+	void Update(void);
 
-  inline void* operator new [](size_t size) {
-    return gMemManager.Allocate(size);
-  }
+	void OnAttack(void);
 
-  inline void operator delete [](void* object) {
-    gMemManager.Free(object);
-  }
+//  inline void* operator new(size_t size) {
+//    return gMemManager.Allocate(size);
+//  }
+//
+//  inline void operator delete(void* object) {
+//    gMemManager.Free(object);
+//  }
+//
+//  inline void* operator new [](size_t size) {
+//    return gMemManager.Allocate(size);
+//  }
+//
+//  inline void operator delete [](void* object) {
+//    gMemManager.Free(object);
+//  }
+
+	static const int FACING_UP     = 0;
+	static const int FACING_RIGHT  = 1;
+	static const int FACING_DOWN   = 2;
+	static const int FACING_LEFT   = 3;
 
-  static const int FACING_UP     = 0;
-  static const int FACING_RIGHT  = 1;
-  static const int FACING_DOWN   = 2;
-  static const int FACING_LEFT   = 3;
-  
 protected:
-  void Move(void);
-  
-  bool CheckTileCollisions(void);
-  bool CheckEntityCollisions(void);
-  bool CheckCharacterCollisions(void);
-  
-  float x;
-  float y;
-  float w;
-  float h;
-  
-  float xVel;
-  float yVel;
-  
-  int tileX;
-  int tileY;
-  
-  Timer attackTimer;
-  bool attacking;
+	void Move(void);
+
+	bool CheckTileCollisions(void);
+	bool CheckEntityCollisions(void);
+	bool CheckCharacterCollisions(void);
+
+	float x;
+	float y;
+	float w;
+	float h;
+
+	float xVel;
+	float yVel;
+
+	int tileX;
+	int tileY;
+
+	Timer attackTimer;
+	bool attacking;
+
+	int _health;
 
-  int _health;
-  
 	LevelGen* map;
-  
-  static const float CHARACTER_SPEED;
-  
-  int directionFacing;
-  
-  static const int ANIM_LEFT_FOOT    = 0;
-  static const int ANIM_NO_FOOT      = 1;
-  static const int ANIM_RIGHT_FOOT   = 2;
-  static const int ANIM_ATTACK       = 3;
 
-  Bar _healthBar;
-  Timer _healthBarDuration;
-  bool _showHealthBar;
+	static const float CHARACTER_SPEED;
+
+	int directionFacing;
+
+	static const int ANIM_LEFT_FOOT    = 0;
+	static const int ANIM_NO_FOOT      = 1;
+	static const int ANIM_RIGHT_FOOT   = 2;
+	static const int ANIM_ATTACK       = 3;
+
+	Bar _healthBar;
+	Timer _healthBarDuration;
+	bool _showHealthBar;
 
 private:
-  static const int ANIMATION_SPEED         = 200;
-  static const int ATTACKING_DISPLAY_LEN   = 150;
+	static const int ANIMATION_SPEED         = 200;
+	static const int ATTACKING_DISPLAY_LEN   = 150;
 
-  static const int SPEACH_BUBBLE_DISPLAY_LENGTH = 6000;
-  
-  SDL_Surface* _texture;
-  
-  // [direction][action]
-  SDL_Rect _sprites[4][4];
-  
-  Timer _animationTimer;
-  int _animationStage;
-  bool _leftFoot;
+	static const int SPEACH_BUBBLE_DISPLAY_LENGTH = 6000;
 
-  list<string> _speachBubble;
-  list<string>::iterator _speachBubbleIter;
-  Timer _speachBubbleTimer;
-  Text _speachBubbleText;
+	SDL_Surface* _texture;
+
+	// [direction][action]
+	SDL_Rect _sprites[4][4];
+
+	Timer _animationTimer;
+	int _animationStage;
+	bool _leftFoot;
+
+	list<string> _speachBubble;
+	list<string>::iterator _speachBubbleIter;
+	Timer _speachBubbleTimer;
+	Text _speachBubbleText;
 };