X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/67c063ab72ebe37d99e036c7a9d3fcecf1e168aa..ddbae5789635a63fcf36a84056f9df4bc8b6adaa:/client.c

diff --git a/client.c b/client.c
index bd12f8e..6110445 100644
--- a/client.c
+++ b/client.c
@@ -21,6 +21,7 @@
 #include "netris.h"
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
@@ -64,6 +65,14 @@ _Sets Sets = {7, 0, 1, 1, 1};
 
 static char keyTable[KT_numKeys+1];
 
+enum {
+	CT_quit, CT_pause,
+	CT_MAX
+};
+static char *cmds[] = {
+	"quit", "pause"
+};
+
 static char *hostStr;
 static int paused = 0;
 static char lastadd;
@@ -105,20 +114,6 @@ void MapKeys(char *newKeys)
 		exit(1);
 }
 
-void WriteConf(void)
-{
-	FILE *file_out;
-
-	file_out = fopen(CONFIG_FILE, "w");
-	if (file_out == NULL)
-		die("Error writing config file");
-
-	fprintf(file_out, "### NETRIS %s Config file ###\n\n", version_string);
-
-	fclose(file_out);
-	fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE);
-}
-
 void Usage(void)
 {
 	Header();
@@ -311,7 +306,7 @@ void CheckClears(int scr)
 		Players[scr].score.score += Game.gravity
 			? linevaluesq[linesCleared - 1] : linevalues[linesCleared - 1];
 		Players[scr].score.lines += linesCleared;
-		Players[scr].score.adds += linesCleared - (linesCleared < 4);
+		Players[scr].score.adds += linesCleared - (linesCleared < 4); //XXX match handicap
 		if (scr == me) {
 			if (game == GT_classicTwo) {
 				SendPacket(scr, NP_clear, 0, NULL);
@@ -342,6 +337,67 @@ void OneGame(void)
 	int chatMode = 0;
 	char chatText[MSG_WIDTH] = "\0";
 
+	void handle_cmd(char cmd, char *arg)
+	{
+		switch (cmd) {
+		case CT_quit:
+			ShowPause(me);
+			refresh();
+			gameStatus = 0;
+			return;
+		case CT_pause:
+			Players[me].flags ^= SCF_paused;
+			if (Game.started > 1)
+				Message(Players[me].flags & SCF_paused
+					? "You paused the game" : "You unpaused the game");
+			else
+				Message(Players[me].flags & SCF_paused
+					? "You are not ready" : "You are ready");
+			checkPaused();
+			if (game == GT_classicTwo)
+				SendPacket(me, NP_pause, 0, NULL);
+			ShowPause(me);
+			changed = 1;
+			return;
+		}
+	}
+
+	void handle_cmdstr(char *cmd)
+	{
+		char tag[17], value[81];
+		char *cmdend;
+		int i;
+
+		if ((cmdend = strchr(cmd, ' '))) {
+			*cmdend = 0;
+		} else {
+			cmdend = cmd + strlen(cmd); // whole string
+		}
+		for (i = 0; i < CT_MAX; i++){
+			if (!strcasecmp(cmds[i], cmd)) {
+				return handle_cmd(i, cmdend + 1);
+			}
+		}
+		Message("Unknown command /%s", cmd);
+	}
+
+	void handle_str(char *str)
+	{
+		if (chatText[0] == '/') {
+			if (chatText[1] != '/') {
+				handle_cmdstr(chatText + 1);
+				return;
+			}
+			memmove(chatText, chatText + 1, strlen(chatText));
+		}
+
+		Message("<\\%d%s\\7> %s",
+			Players[me].team > 7 ? 7 : Players[me].team,
+			Players[me].name, chatText);
+		if (game == GT_classicTwo)
+			SendPacket(me, NP_msg, strlen(chatText) + 1, chatText);
+	}
+
 	void GameKey(char key)
 	{
 		char *p;
@@ -351,11 +407,7 @@ void OneGame(void)
 				// enter text
 				chatMode = 0;
 				if (chatText[0]) {
-					Message("<\\%d%s\\7> %s",
-						Players[me].team > 7 ? 7 : Players[me].team,
-						Players[me].name, chatText);
-					if (game == GT_classicTwo)
-						SendPacket(me, NP_msg, strlen(chatText) + 1, chatText);
+					handle_str(chatText);
 					memset(chatText, 0, sizeof(chatText));
 				} //say it
 				else Messagetype(27, -1, NULL); //escape
@@ -374,42 +426,34 @@ void OneGame(void)
 		if (!(p = strchr(keyTable, tolower(key)))) return;
 		key = p - keyTable;
 
-		// global actions (always possible, even if not playing)
+	bool handle_key(char key)
+	{
 		switch (key) {
 		case KT_redraw:
 			clear();
 			InitFields();
 //			ScheduleFullRedraw();
 			refresh();
-			return;
+			return 1;
 		case KT_say:
 			chatMode = 1;
 			Messagetype(key, strlen(chatText) - 1, chatText);
-			return;
+			return 1;
 		case KT_quit:
-			ShowPause(me);
-			refresh();
-			gameStatus = 0;
-			return;
+			handle_cmd(CT_quit, NULL);
+			return 1;
+		default:
+			return 0;
 		}
+	}
+		// global actions (always possible, even if not playing)
+		if (handle_key(key)) return;
 
 		if (Players[me].alive <= 0) return;
 		// actions available while in game
 		switch (key) {
 		case KT_pause:
-			Players[me].flags ^= SCF_paused;
-			if (Game.started > 1)
-				Message(Players[me].flags & SCF_paused
-					? "You paused the game" : "You unpaused the game");
-			else
-				Message(Players[me].flags & SCF_paused
-					? "You are not ready" : "You are ready");
-			checkPaused();
-			if (game == GT_classicTwo)
-				SendPacket(me, NP_pause, 0, NULL);
-			ShowPause(me);
-			changed = 1;
-			return;
+			return handle_cmd(CT_pause, NULL);
 		}
 
 		if (paused) return;