X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=manager%2Fstratego.cpp;h=d84819f55b089cac36444817de8296921f77f7bb;hp=ba59c5f86b8d01ec50005d2797574343058d959d;hb=fe470c015d73d07c44f0e951a2bb205d95763f22;hpb=041c37d1dfc4a94024fe1d329d289e4c59667885

diff --git a/manager/stratego.cpp b/manager/stratego.cpp
index ba59c5f..d84819f 100644
--- a/manager/stratego.cpp
+++ b/manager/stratego.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+
 
 #include "stratego.h"
 
@@ -7,19 +7,18 @@ using namespace std;
 /**
  * Static variables
  */
-Board Board::theBoard(10,10);
+
 //nothing, boulder, flag, spy, scout, miner, sergeant, lietenant, captain, major, colonel, general, marshal, bomb, error
-char  Piece::tokens[] = {'.','+','F','y','s','n','S','L','c','m','C','G','M','B','?'};
+char  Piece::tokens[] = {'.','*','F','s','9','8','7','6','5','4','3','2','1','B','?'};
 int Piece::maxUnits[] = {0,0,1,1,8,5,4,4,4,3,2,1,1,6,0};
 
 
 
-#ifdef GRAPHICS
-	Piece::TextureManager Piece::textures;
-#endif //GRAPHICS
+
+Piece::TextureManager Piece::textures;
+
 
 
-#ifdef GRAPHICS
 
 Piece::TextureManager::~TextureManager()
 {
@@ -42,7 +41,7 @@ Texture & Piece::TextureManager::operator[](const LUint & at)
 	}
 	return *(Array<Texture*>::operator[](at));
 }
-#endif //GRAPHICS
+
 
 /**
  * Gets the type of a piece, based off a character token
@@ -93,7 +92,7 @@ Board::~Board()
 /**
  * Print textual representation of the board to a stream
  * @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 '#' or '*' for RED or BLUE respectively.
+ * @param reveal - Pieces matching this colour will have their identify revealed, other pieces will be shown as '#'
  */
 void Board::Print(FILE * stream, const Piece::Colour & reveal)
 {
@@ -108,26 +107,89 @@ void Board::Print(FILE * stream, const Piece::Colour & reveal)
 			}
 			else if (piece->colour != Piece::NONE && (piece->colour == reveal || reveal == Piece::BOTH))
 			{
+
 				fprintf(stream, "%c", Piece::tokens[piece->type]);
+
+
 			}
 			else
 			{
 				switch (piece->colour)
 				{
 					case Piece::RED:
+					case Piece::BLUE:
 						fprintf(stream, "#");
+						break;
+					case Piece::NONE:
+						fprintf(stream, "+");
+						break;
+					case Piece::BOTH:
+						fprintf(stream, "$");
+						break;
+				}
+			}
+		}
+		fprintf(stream, "\n");
+	}
+	
+}
+
+/**
+ * Print textual representation of the board to a stream
+ * @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)
+{
+	for (int y=0; y < height; ++y)
+	{
+		for (int x=0; x < width; ++x)
+		{
+			Piece * piece = board[x][y];
+			if (piece == NULL)
+			{
+				fprintf(stream, ".");
+			}
+			else if (piece->colour != Piece::NONE && (piece->colour == reveal || reveal == Piece::BOTH))
+			{
+				switch (piece->colour)	
+				{
+					case Piece::RED:
+						fprintf(stream, "%c[%d;%d;%dm",0x1B,1,31,40);
+						break;
+					case Piece::BLUE:
+						fprintf(stream, "%c[%d;%d;%dm",0x1B,1,34,40);
+						break;
+					default:
+						break;
+				}
+				fprintf(stream, "%c", Piece::tokens[piece->type]);
+
+			}
+			else
+			{
+				switch (piece->colour)
+				{
+					case Piece::RED:
+						fprintf(stream, "%c[%d;%d;%dm",0x1B,1,31,41);
+
 						break;
 					case Piece::BLUE:
-						fprintf(stream, "*");
+						fprintf(stream, "%c[%d;%d;%dm",0x1B,1,34,44);
 						break;
 					case Piece::NONE:
-						fprintf(stream, "+"); 
+						fprintf(stream, "%c[%d;%d;%dm",0x1B,1,37,47);
 						break;
 					case Piece::BOTH:
-						fprintf(stream, "$"); //Should never see these!
+						//Should never see this
+						fprintf(stream, "%c[%d;%d;%dm",0x1B,1,33,43);
 						break;
-				}
+
+				}	
+				fprintf(stream, "#");
+				
 			}
+			fprintf(stream, "%c[%d;%d;%dm",0x1B,0,7,0);
 		}
 		fprintf(stream, "\n");
 	}
@@ -135,7 +197,7 @@ void Board::Print(FILE * stream, const Piece::Colour & reveal)
 }
 
 
-#ifdef GRAPHICS
+
 /**
  * Draw the board state to graphics
  * @param reveal - Pieces matching this colour will be revealed. All others will be shown as blank coloured squares.
@@ -144,7 +206,9 @@ void Board::Draw(const Piece::Colour & reveal)
 {
 	if (!Graphics::Initialised())
 	{
-		Graphics::Initialise("Stratego", width*32, height*32);
+		fprintf(stderr, "ERROR - Board::Draw called whilst graphics disabled!!!\n");
+		exit(EXIT_FAILURE);
+		
 	}
 
 	Graphics::ClearScreen();
@@ -170,10 +234,10 @@ void Board::Draw(const Piece::Colour & reveal)
 				switch (piece->colour)
 				{
 					case Piece::RED:
-						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+						Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
 						break;
 					case Piece::BLUE:
-						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+						Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
 						break;
 					case Piece::NONE:
 						Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
@@ -189,7 +253,6 @@ void Board::Draw(const Piece::Colour & reveal)
 	Graphics::UpdateScreen();
 	
 }
-#endif //GRAPHICS
 
 /**
  * Adds a piece to the board