X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/368e88e0239eb53ee80287d8c298ed401622781e..50f9d7882f93716af8b7436e88d1da62f05e198b:/game.c

diff --git a/game.c b/game.c
index 5e3f689..5779d84 100644
--- a/game.c
+++ b/game.c
@@ -319,8 +319,10 @@ void OneGame(void)
 	{
 		char *p;
 
-		if (key == 13) {
-			if (!(chatMode = !chatMode)) {
+		if (chatMode) {
+			if (key == 13) {
+				// enter text
+				chatMode = 0;
 				if (chatText[0]) {
 					Message("<\\%d%s\\7> %s",
 						Players[me].team > 7 ? 7 : Players[me].team,
@@ -331,20 +333,22 @@ void OneGame(void)
 				} //say it
 				else Messagetype(27, -1, NULL); //escape
 				return;
-			} //leave chat mode
-		} //enter pressed (start/stop chat mode)
-
-		if (chatMode) {
-			if (key == 27) //escape
+			}
+			else if (key == 27) //escape
 				chatMode = 0;
 			else if (key == 127 && chatText) //backspace
 				chatText[strlen(chatText) - 1] = 0;
-			else if (key != 13 && strlen(chatText) < MSG_WIDTH-1) //text
+			else if (strlen(chatText) < MSG_WIDTH-1) //text
 				chatText[strlen(chatText)] = key;
 			Messagetype(key, strlen(chatText) - 1, chatText);
 			return;
 		} //key in chat mode
 
+		if (key == 13) {
+			chatMode = 1;
+			Messagetype(key, strlen(chatText) - 1, chatText);
+		}
+
 		if (!(p = strchr(keyTable, tolower(key)))) return;
 		key = p - keyTable;
 		if (Players[me].alive <= 0 && key != KT_quit) return;