X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=judge%2Fmanager%2Fgame.h;h=ce83545bc301eb198d159d9cdd5d08355ad13d8f;hp=43f4d0e7f6cb287393cd77c32794880051f6fc07;hb=add28d0a7f265f5fcfdd67a4c1e590b19f76272e;hpb=78293905481ab7a67e773d05350da29940a58ea6

diff --git a/judge/manager/game.h b/judge/manager/game.h
index 43f4d0e..ce83545 100644
--- a/judge/manager/game.h
+++ b/judge/manager/game.h
@@ -4,17 +4,19 @@
 #include "stratego.h"
 #include "ai_controller.h"
 #include "human_controller.h"
+#include "network_controller.h"
 #include <cstring>
 
 
 /**
  * Class to manage the game
+ * Bit messy since I keep adding on parameters :P
  */
 class Game
 {
 	public:
-		Game(const char * redPath, const char * bluePath, const bool enableGraphics, double newStallTime = 1.0, const bool allowIllegal=false, FILE * newLog = NULL, const Piece::Colour & newRevealed = Piece::BOTH, int maxTurns = 5000, const bool printBoard = false);
-		Game(const char * fromFile, const bool enableGraphics, double newStallTime = 1.0, const bool allowIllegal=false, FILE * newLog = NULL, const Piece::Colour & newRevealed = Piece::BOTH, int maxTurns = 5000, const bool printBoard = false);
+		Game(const char * redPath, const char * bluePath, const bool enableGraphics, double newStallTime = 1.0, const bool allowIllegal=false, FILE * newLog = NULL, const Piece::Colour & newRevealed = Piece::BOTH, int maxTurns = 5000, const bool printBoard = false, double newTimeoutTime = 2.0, const char * newImageOutput = "");
+		Game(const char * fromFile, const bool enableGraphics, double newStallTime = 1.0, const bool allowIllegal=false, FILE * newLog = NULL, const Piece::Colour & newRevealed = Piece::BOTH, int maxTurns = 5000, const bool printBoard = false, double newTimeoutTime = 2.0, const char * newImageOutput = "");
 		virtual ~Game();
 
 		
@@ -22,6 +24,7 @@ class Game
 		void Wait(double wait); 
 
 		Piece::Colour Setup(const char * redName, const char * blueName);
+		MovementResult CheckVictoryAttrition();
 		MovementResult Play();
 		void PrintEndMessage(const MovementResult & result);
 		
@@ -34,8 +37,13 @@ class Game
 		int TurnCount() const {return turnCount;}
 
 		static Game * theGame;
+		static int Tokenise(std::vector<std::string> & buffer, std::string & str, char split = ' '); //Helper - Split a string into tokens
+
+	private:
+		void MakeControllers(const char * redPath, const char * bluePath); //Create a controller based off a path
 	public:
 		int logMessage(const char * format, ...);
+		static void PrintResults(const MovementResult & result, std::string & buffer);
 		FILE * GetLogFile() const {return log;}
 		Controller * red;
 		Controller * blue;
@@ -63,6 +71,10 @@ class Game
 
 		int maxTurns;
 		const bool printBoard;
+
+	private:
+		double timeoutTime;
+		std::string imageOutput;
 		
 };
 
@@ -72,7 +84,7 @@ class FileController : public Controller
 		FileController(const Piece::Colour & newColour, FILE * newFile) : Controller(newColour, "file"), file(newFile) {}
 		virtual ~FileController() {}
 
-		virtual void Message(const char * string) {} //Don't send messages
+		virtual bool Message(const char * string) {return true;} //Don't send messages
 		virtual MovementResult QuerySetup(const char * opponentName, std::string setup[]);
 		virtual MovementResult QueryMove(std::string & buffer);
 		virtual bool Valid() const {return file != NULL;}
@@ -83,6 +95,7 @@ class FileController : public Controller
 
 };
 
+std::string itostr(int i);
 
 
 #endif //MAIN_H