X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/c7eeb8f0c70c3d6538b7199f0e2094967413d35d..1e155d969ded8f4aa11411be7f60299b45a56f04:/game.c

diff --git a/game.c b/game.c
index 7537fc4..a5a72ad 100644
--- a/game.c
+++ b/game.c
@@ -52,12 +52,12 @@ static struct option options[] = {
 
 enum {
 	KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down,
-	KT_faster, KT_pause, KT_redraw, KT_quit, KT_numKeys
+	KT_faster, KT_pause, KT_redraw, KT_say, KT_quit, KT_numKeys
 };
 
 static char *keyNames[KT_numKeys+1] = {
 	"Left", "Right", "RotRight", "RotLeft", "Drop", "Down",
-	"Faster", "Pause", "Redraw", "Quit", NULL
+	"Faster", "Pause", "Redraw", "Say", "Quit", NULL
 };
 
 _Sets Sets = {7, 0, 1, 1, 1};
@@ -125,6 +125,7 @@ void HandleOption(char tag, char *value)
 	case 'a':	//ascii
 		if (value && !strcasecmp(value, "0")) Sets.ascii = 0;
 		else Sets.ascii = 1;
+		Sets.drawstyle &= ~Sets.ascii;
 		break;
 	case 'c':	//connect
 		game = GT_classicTwo;
@@ -137,10 +138,7 @@ void HandleOption(char tag, char *value)
 		Game.initspeed = atof(value) * 1e6;
 		break;
 	case 'l':	//level
-		if ((Players[0].score.level = atof(value)) < 1)
-			Players[0].score.level = 1;
-		if (Players[0].score.level > 15)
-			Players[0].score.level = 15;
+		Players[0].score.level = MIN(MAX(atof(value), 1), 15);
 		break;
 	case 'n':	//nick
 		memcpy(Players[0].name, value, strlen(value) + 1);
@@ -294,8 +292,7 @@ void CheckClears(int scr)
 					short junkLines;
 					netint4 data[1];
 
-					if (Game.gravity) junkLines = linesCleared - 1;
-					else junkLines = linesCleared - (linesCleared < 4);
+					junkLines = linesCleared - (Game.gravity ? 1 : linesCleared < 4);
 					data[0] = junkLines;
 					SendPacket(me, NP_giveJunk, sizeof(data), data);
 					Message("\\%dYou send %d lines",
@@ -322,34 +319,74 @@ 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,
 						Players[me].name, chatText);
-					if (game==GT_classicTwo)
+					if (game == GT_classicTwo)
 						SendPacket(me, NP_msg, strlen(chatText) + 1, chatText);
 					memset(chatText, 0, sizeof(chatText));
 				} //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 (!(p = strchr(keyTable, tolower(key)))) return;
 		key = p - keyTable;
-		if (Players[me].alive <= 0 && key != KT_quit) return;
-		if (paused && key < KT_pause) return;
+
+		// global actions (always possible, even if not playing)
+		switch (key) {
+		case KT_redraw:
+			clear();
+			InitFields();
+//			ScheduleFullRedraw();
+			refresh();
+			return;
+		case KT_say:
+			chatMode = 1;
+			Messagetype(key, strlen(chatText) - 1, chatText);
+			return;
+		case KT_quit:
+			ShowPause(me);
+			refresh();
+			gameStatus = 0;
+			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;
+		}
+
+		if (paused) return;
+		// actions only available while actually playing
 		switch (key) {
 		case KT_left:
 			if (MovePiece(me, 0, -1) && spied) SendPacket(me, NP_left, 0, NULL);
@@ -389,32 +426,8 @@ void OneGame(void)
 			ShowScore(me, Players[me].score);
 			changed = 1;
 			break;
-		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;
-			break;
-		case KT_redraw:
-			clear();
-			InitFields();
-//			ScheduleFullRedraw();
-			refresh();
-			break;
-		case KT_quit:
-			ShowPause(me);
-			refresh();
-			gameStatus = 0;
-			break;
-		} //E_key
+		}
+
 		if (dropMode && DropPiece(me) > 0) {
 			SetITimer(Game.speed, Game.speed);
 			if (spied) SendPacket(me, NP_drop, 0, NULL);
@@ -429,7 +442,6 @@ void OneGame(void)
 		switch(net.type) {
 		case NP_newPiece:
 		{
-			FreezePiece(net.uid);
 			memcpy(&Players[net.uid].nextShape, net.data,
 				sizeof(Players[0].nextShape));
 			StartNewPiece(net.uid, Players[net.uid].curShape);
@@ -583,24 +595,24 @@ void OneGame(void)
 			break;
 		} //(un)pause
 		case NP_part:
+			// player left
 			checkPaused();
 			oldPaused = 0;
-		{
 			Players[net.uid].alive = -1;
 			Message("%s left", Players[net.uid].name);
 			checkPaused();
 			ShowPause(net.uid);
 			changed = 1;
 			break;
-		} //player left
 		case NP_argghhh:
 		{
 			char i;
 			memcpy(&i, net.data, sizeof(i));
 			Players[net.uid].alive = 0;
-			if (i == me) Message("\\%dYou fragged %s",
+			if (i == me)
+				Message("\\%dYou fragged %s",
 					Players[me].team > 7 ? 7 : Players[me].team, Players[net.uid].name);
-			else if (i==net.uid)
+			else if (i == net.uid)
 				Message("\\%d%s died",
 					Players[i].team > 7 ? 7 : Players[i].team, Players[i].name);
 			else