X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=manager%2Fstratego.h;h=39e887310d6e43f23f858eb3f4f580afd601166f;hp=877af2d19ad7df952a6367ea6741a6088d746a2a;hb=fe470c015d73d07c44f0e951a2bb205d95763f22;hpb=f91a915d6f64f9d35e867d26e8ddb9c1b1ab0c1e

diff --git a/manager/stratego.h b/manager/stratego.h
index 877af2d..39e8873 100644
--- a/manager/stratego.h
+++ b/manager/stratego.h
@@ -6,10 +6,10 @@
 
 #include <assert.h>
 
-#ifdef GRAPHICS
+
 	#include "graphics.h"
 	#include "array.h"
-#endif //GRAPHICS
+
 
 /**
  * Contains classes for a game of Stratego
@@ -51,7 +51,6 @@ class Piece
 		const Type type; 
 		const Colour colour;
 
-	#ifdef GRAPHICS
 		public:
 
 			class TextureManager : public Graphics::TextureManager<LUint>, private Array<Texture*>
@@ -85,10 +84,12 @@ class Piece
 
 			
 			
-	#endif //GRAPHICS
+
 		
 };
 
+#include "movementresult.h"
+
 /**
  * A Stratego board
  */
@@ -100,9 +101,10 @@ class Board
 		virtual ~Board(); //Destructor
 
 		void Print(FILE * stream, const Piece::Colour & reveal=Piece::BOTH); //Print board
-		#ifdef GRAPHICS
-			void Draw(const Piece::Colour & reveal=Piece::BOTH); //Draw board
-		#endif //GRAPHICS
+		void PrintPretty(FILE * stream, const Piece::Colour & reveal=Piece::BOTH); //Print board using colour
+		
+		void Draw(const Piece::Colour & reveal=Piece::BOTH); //Draw board
+		
 
 		bool AddPiece(int x, int y, const Piece::Type & newType, const Piece::Colour & newColour); //Add piece to board
 
@@ -112,16 +114,15 @@ class Board
 
 		typedef enum {UP, DOWN, LEFT, RIGHT} Direction;
 
-		typedef enum {OK, DIES, KILLS, BOTH_DIE, NO_BOARD, INVALID_POSITION, NO_SELECTION, NOT_YOUR_UNIT, IMMOBILE_UNIT, INVALID_DIRECTION, POSITION_FULL, VICTORY, BAD_RESPONSE, NO_MOVE} MovementResult; //The possible results from a move
-		//WARNING: Some of the MovementResults are returned by the Controller class in "controller.h", in Controller::MakeMove
+		
 		
 		static bool LegalResult(const MovementResult & result)
 		{
-			return (result == OK || result == DIES || result == KILLS || result == BOTH_DIE);
+			return (result == MovementResult::OK || result == MovementResult::DIES || result == MovementResult::KILLS || result == MovementResult::BOTH_DIE || result == MovementResult::VICTORY || result == MovementResult::DRAW);
 		}	
 
 		MovementResult MovePiece(int x, int y, const Direction & direction, int multiplier=1,const Piece::Colour & colour=Piece::NONE); //Move piece from position in direction
-		static Board theBoard;
+	
 
 		Piece::Colour winner;