X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fttt-error.c;h=5d331afbef46d09c41663deafecd020ba89212c3;hp=4bd5498ea602f974e286404acc177d4624768a21;hb=122d6b8810d67c601fe260e25ec323bb001698af;hpb=82b903360548669988e41ffe055bc2215a28b404

diff --git a/src/ttt-error.c b/src/ttt-error.c
index 4bd5498..5d331af 100644
--- a/src/ttt-error.c
+++ b/src/ttt-error.c
@@ -26,28 +26,45 @@ ttt_error_string (ttt_error_t error)
 {
     switch (error) {
     case TTT_ERROR_NONE:
-	return "ERROT NONE\n";
+	return "ERROR NONEi\r\n";
+
+    /* 3.1. Connection setup errors */
     case TTT_ERROR_NO_NAME_SET:
-	return "ERROR NONAMESET\n";
+	return "ERROR NO_NAME_SET\r\n";
     case TTT_ERROR_INVALID_NAME:
-	return "ERROR INVALIDNAME\n";
+	return "ERROR INVALID_NAME\r\n";
+
+    /* 3.2. Command format errors */
     case TTT_ERROR_COMMAND:
-	return "ERROR COMMAND\n";
+	return "ERROR COMMAND\r\n";
     case TTT_ERROR_SYNTAX:
-	return "ERROR SYNTAX\n";
+	return "ERROR SYNTAX\r\n";
     case TTT_ERROR_NOT_NUMBER:
-	return "ERROR NOTNUMBER\n";
+	return "ERROR NOT_NUMBER\r\n";
     case TTT_ERROR_NOT_GRID:
-	return "ERROR NOTGRID\n";
+	return "ERROR NOT_GRID\r\n";
+
+    /* 3.3. Global command errors */
+
+    /* 3.4. Game management errors */
+    case TTT_ERROR_NO_INVITE:
+	return "ERROR NO_INVITE\r\n";
+    case TTT_ERROR_NO_GAME:
+	return "ERROR NO_GAME\r\n";
+
+    /* 3.5. User information errors */
     case TTT_ERROR_NO_USER:
-	return "ERROR NOUSER\n";
-    case TTT_ERROR_NOT_IN_GAME:
-	return "ERROR_NOTINGAME\n";
+	return "ERROR NO_USER\r\n";
+
+    /* 3.6. In-game errors */
     case TTT_ERROR_NOT_PLAYING:
-	return "ERROR_NOTPLAYING\n";
+	return "ERROR_NOT_PLAYING\r\n";
     case TTT_ERROR_NOT_YOUR_TURN:
-	return "ERROR NOTYOURTURN\n";
-    /* Not an actual protocol errror, so this should never happen. */
+	return "ERROR NOT_YOUR_TURN\r\n";
+    case TTT_ERROR_NOT_VALID_MOVE:
+	return "ERROR NOT_VALID_MOVE\r\n";
+
+    /* Here's a non-protocol pseudo-error used to implement QUIT. */
     case TTT_ERROR_QUIT_REQUESTED:
 	ASSERT_NOT_REACHED;
 	break;