X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=judge%2Fmanager%2Fstratego.cpp;h=0e299cbf10035b7df77814a621c1beb7047a4c1e;hp=5acfaa38250b07152732069bda41c636894eb230;hb=c586078161ee546c853f6c492bd791a4a92aff1b;hpb=e1153eebe8cfd0c881cef2ff8fca63f130e736b3

diff --git a/judge/manager/stratego.cpp b/judge/manager/stratego.cpp
index 5acfaa3..0e299cb 100644
--- a/judge/manager/stratego.cpp
+++ b/judge/manager/stratego.cpp
@@ -57,6 +57,27 @@ Piece::Type Piece::GetType(char fromToken)
 	return Piece::BOULDER;
 }
 
+/**
+ * Gets the opposite to the indicated colour
+ */
+Piece::Colour Piece::OppositeColour(const Colour & colour)
+{
+	switch (colour)
+	{
+		case Piece::RED:
+			return Piece::BLUE;
+			break;
+		case Piece::BLUE:
+			return Piece::RED;
+			break;
+		case Piece::BOTH:
+			return Piece::BOTH;
+			break;
+		case Piece::NONE:
+			return Piece::NONE;
+	}
+}
+
 /**
  * Construct a new, empty board
  * @param newWidth - the width of the board
@@ -136,7 +157,7 @@ void Board::Print(FILE * stream, const Piece::Colour & reveal)
  * @param stream - the stream to print information to
  * @param reveal - Pieces matching this colour will have their identify revealed, other pieces will be shown as '#'
  */
-void Board::PrintPretty(FILE * stream, const Piece::Colour & reveal)
+void Board::PrintPretty(FILE * stream, const Piece::Colour & reveal, bool showRevealed)
 {
 	for (int y=0; y < height; ++y)
 	{
@@ -147,7 +168,8 @@ void Board::PrintPretty(FILE * stream, const Piece::Colour & reveal)
 			{
 				fprintf(stream, ".");
 			}
-			else if (piece->colour != Piece::NONE && (piece->colour == reveal || reveal == Piece::BOTH))
+			else if ((piece->colour != Piece::NONE && (piece->colour == reveal || reveal == Piece::BOTH))
+					|| (piece->beenRevealed && showRevealed))
 			{
 				switch (piece->colour)	
 				{
@@ -212,7 +234,7 @@ void Board::Draw(const Piece::Colour & reveal, bool showRevealed)
 	}
 
 	Graphics::ClearScreen();
-	
+	float scale = (float)(Piece::textures[(int)(Piece::NOTHING)].width()) / (float)(GRID_SIZE);
 	for (int y=0; y < height; ++y)
 	{
 		for (int x=0; x < width; ++x)
@@ -227,7 +249,8 @@ void Board::Draw(const Piece::Colour & reveal, bool showRevealed)
 					|| (piece->beenRevealed && showRevealed))
 			{
 				//Display the piece
-				Piece::textures[(int)(piece->type)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+				
+				Piece::textures[(int)(piece->type)].DrawColour(x*GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale, Piece::GetGraphicsColour(piece->colour));
 				
 			}
 			else
@@ -235,16 +258,16 @@ void Board::Draw(const Piece::Colour & reveal, bool showRevealed)
 				switch (piece->colour)
 				{
 					case Piece::RED:
-						Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+						Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale, Piece::GetGraphicsColour(piece->colour));
 						break;
 					case Piece::BLUE:
-						Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+						Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale, Piece::GetGraphicsColour(piece->colour));
 						break;
 					case Piece::NONE:
-						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale, Piece::GetGraphicsColour(piece->colour));
 						break;
 					case Piece::BOTH:
-						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale, Piece::GetGraphicsColour(piece->colour));
 						break;
 				}
 			}
@@ -322,6 +345,8 @@ MovementResult Board::MovePiece(int x, int y, const Direction & direction, int m
 	{
 		return MovementResult(MovementResult::IMMOBILE_UNIT);
 	}
+	if (multiplier < 1)
+		return MovementResult(MovementResult::INVALID_DIRECTION); //Don't allow moves that don't actually move forward
 	if (multiplier > 1 && target->type != Piece::SCOUT)
 	{
 		return MovementResult(MovementResult::INVALID_DIRECTION); //Can only move a scout multiple times.