X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/2708de3d9437a12ee943f0740830aa97d9c3c136..93d1d285b606413a0c60905f8b43389661ac30ec:/client.c

diff --git a/client.c b/client.c
index e3a2ffc..926c08b 100644
--- a/client.c
+++ b/client.c
@@ -73,7 +73,7 @@ static char *cmds[] = {
 };
 
 static char *hostStr;
-static int paused = 0;
+static bool paused = 0;
 static char lastadd;
 
 
@@ -251,8 +251,7 @@ void game_setpaused(void)
 
 	paused = Game.started < 1;
 	for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive > 0)
-		paused |= Players[i].flags & SCF_paused;
-	if (paused) paused = 1;
+		paused |= (Players[i].flags & SCF_paused) != 0;
 }
 
 void game_reset(void)
@@ -613,9 +612,6 @@ void game_loop(void)
 		} //stop game
 		case NP_newPlayer:
 		{
-			char teams[10][7] = { "", "Green", "Cyan", "Blue", "Purple",
-								  "Red", "Grey", "White", "*Orange" };
-
 			if (net.uid>maxPlayer) maxPlayer = net.uid;
 			memcpy(&Players[net.uid], net.data, net.size);
 			ClearField(net.uid);
@@ -624,7 +620,7 @@ void game_loop(void)
 				Message("%s joined the game", Players[net.uid].name);
 			else
 				Message("%s joined %s team", Players[net.uid].name,
-					teams[Players[net.uid].team]);
+					teamname[Players[net.uid].team]);
 			if (Players[net.uid].flags & SCF_paused) {
 				game_setpaused();
 			} //player has paused