X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=judge%2Fmanager%2Fstratego.h;h=a2cd8bd4d8f2a1e4a59c9aa1131f288a0f11613e;hp=c8f4f9d76a6b58643c4a0ecf96f74888ab566363;hb=f37d392713a0b6fec7a2c543edcd8402156f3744;hpb=78293905481ab7a67e773d05350da29940a58ea6

diff --git a/judge/manager/stratego.h b/judge/manager/stratego.h
index c8f4f9d..a2cd8bd 100644
--- a/judge/manager/stratego.h
+++ b/judge/manager/stratego.h
@@ -28,6 +28,9 @@ class Piece
 	
 		typedef enum {RED=0, BLUE=1, NONE=2, BOTH=3} Colour; //Used for the allegiance of the pieces - terrain counts as NONE.
 
+		static Colour OppositeColour(const Colour & compare);
+	
+
 		Piece(const Type & newType, const Colour & newColour) : type(newType), colour(newColour), beenRevealed(false) {}
 		virtual ~Piece() {}
 
@@ -73,10 +76,14 @@ class Piece
 				switch (colour)
 				{
 					case RED:
-						return Graphics::Colour(1,0,0);
+						return Graphics::Colour(1.0,0,0);
 						break;
 					case BLUE:
-						return Graphics::Colour(0,0,1);
+						#ifdef __MACOSX__ //Horrible HACK to make pieces green on Mac OSX, because Blue doesn't exist on this operating system.
+							return Graphics::Colour(0,1.0,0);
+						#else
+							return Graphics::Colour(0,0,1.0);
+						#endif //__MACOSX__
 						break;
 					case NONE:
 						return Graphics::Colour(0.5,0.5,0.5);
@@ -106,7 +113,7 @@ class Board
 		virtual ~Board(); //Destructor
 
 		void Print(FILE * stream, const Piece::Colour & reveal=Piece::BOTH); //Print board
-		void PrintPretty(FILE * stream, const Piece::Colour & reveal=Piece::BOTH); //Print board using colour
+		void PrintPretty(FILE * stream, const Piece::Colour & reveal=Piece::BOTH, bool showRevealed=true); //Print board using colour
 		
 		#ifdef BUILD_GRAPHICS
 		void Draw(const Piece::Colour & reveal=Piece::BOTH, bool showRevealed = true); //Draw board
@@ -124,12 +131,12 @@ class Board
 		
 		static bool LegalResult(const MovementResult & result)
 		{
-			return (result == MovementResult::OK || result == MovementResult::DIES || result == MovementResult::KILLS || result == MovementResult::BOTH_DIE || result == MovementResult::VICTORY || result == MovementResult::DRAW || result == MovementResult::DRAW_DEFAULT || result == MovementResult::SURRENDER);
+			return (result == MovementResult::OK || result == MovementResult::DIES || result == MovementResult::KILLS || result == MovementResult::BOTH_DIE || result == MovementResult::VICTORY_FLAG || result == MovementResult::VICTORY_ATTRITION || result == MovementResult::DRAW || result == MovementResult::DRAW_DEFAULT || result == MovementResult::SURRENDER);
 		}
 
 		static bool HaltResult(const MovementResult & result)
 		{
-			return (result == MovementResult::VICTORY || result == MovementResult::DRAW || result == MovementResult::DRAW_DEFAULT || result == MovementResult::SURRENDER || !LegalResult(result));
+			return (result == MovementResult::VICTORY_FLAG || result == MovementResult::VICTORY_ATTRITION || result == MovementResult::DRAW || result == MovementResult::DRAW_DEFAULT || result == MovementResult::SURRENDER || !LegalResult(result));
 		}		
 
 		MovementResult MovePiece(int x, int y, const Direction & direction, int multiplier=1,const Piece::Colour & colour=Piece::NONE); //Move piece from position in direction