X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=judge%2Fmanager%2Fcontroller.cpp;h=3a78e9b902e82349e789f6fce0a46ef70782143f;hp=1b0a35d0dca0b1972b78a095b710f077a90cd293;hb=037a4b52ab76fe90955d671604238e02f3e4f5a2;hpb=1a03b2543b67f0551e62babec4cd119f1e0e4640

diff --git a/judge/manager/controller.cpp b/judge/manager/controller.cpp
index 1b0a35d..3a78e9b 100644
--- a/judge/manager/controller.cpp
+++ b/judge/manager/controller.cpp
@@ -80,6 +80,8 @@ MovementResult Controller::MakeMove(string & buffer)
 	if (query != MovementResult::OK)
 		return query;
 
+	/* 
+	//Removed 3/01/12 NO_MOVE now not allowed, SURRENDER is undocumented and not necessary
 	if (buffer == "NO_MOVE")
 	{
 		buffer += " OK";
@@ -90,6 +92,7 @@ MovementResult Controller::MakeMove(string & buffer)
 		buffer += " OK";
 		return MovementResult::SURRENDER;
 	}
+	*/
 	
 	int x; int y; string direction="";
 	stringstream s(buffer);
@@ -138,8 +141,11 @@ MovementResult Controller::MakeMove(string & buffer)
 		case MovementResult::OK:
 			buffer += " OK";
 			break;
-		case MovementResult::VICTORY:
-			buffer += " FLAG";
+		case MovementResult::VICTORY_FLAG:
+			buffer += " VICTORY_FLAG";
+			break;
+		case MovementResult::VICTORY_ATTRITION:
+			buffer += " VICTORY_ATTRITION";
 			break;
 		case MovementResult::KILLS:
 			buffer += " KILLS ";
@@ -182,3 +188,5 @@ MovementResult Controller::MakeMove(string & buffer)
 	return moveResult; 	
 
 }
+
+