reverted to old cell type

1 files changed, 11 insertions, 6 deletions

diff --git a/Cell.h b/Cell.h
index 67ccc84..44c3bab 100644
--- a/Cell.h
+++ b/Cell.h
@@ -15,11 +15,14 @@ struct Coordinates
 };

 

 

-typedef uint8 CellState;

-// empty if 0 so we can just do "if (cell)"

-// player id is CellState/2, it's a real player if it's odd, a wall if even.

-#define EMPTY_CELL 0

-#define BOOM 1

+typedef enum 

+{

+	EMPTY_CELL,

+	BOOM,

+	PLAYER,

+	PLAYER_WALL,

+	PLAYER_JUST_MOVED

+} CellState;

 

 class Cell

 {

@@ -33,10 +36,12 @@ public:
 	void setState(CellState cs);

 	CellState getState();

 

-	PlayerNumber getPlayer();

+	Player* getPlayer();

+	void setPlayer(Player* pPlayer);

 

 private:

 	CellState m_currentState;

+  Player* m_pPlayer; // A pointer to the player currently or previously on this space. May be NULL.

 

 };