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

diff --git a/client.c b/client.c
index b8b7eed..e3a2ffc 100644
--- a/client.c
+++ b/client.c
@@ -149,7 +149,7 @@ void handle_arg(char tag, char *value)
 		Sets.drawstyle &= ~Sets.ascii;
 		break;
 	case 'c':	//connect
-		game = GT_classicTwo;
+		Game.type = GT_classicTwo;
 		hostStr = value;
 		break;
 	case 'p':	//port
@@ -288,7 +288,7 @@ void game_clear(int scr)
 	                      2500, 3000, 3500, 4000, 4500, 5000, 6000, 7500 };
 
 	if ((linesCleared = ClearFullLines(scr)) > 0) {
-		if (game == GT_onePlayer)
+		if (Game.type == GT_onePlayer)
 			if ((Players[scr].score.lines / 10) <
 					((Players[scr].score.lines+linesCleared)/10)) {
 				if ((Game.speed /= SPEEDINC) < SPEEDMINIMUM)
@@ -301,7 +301,7 @@ void game_clear(int scr)
 		Players[scr].score.lines += linesCleared;
 		Players[scr].score.adds += linesCleared - (linesCleared < 4); //XXX match handicap
 		if (scr == me) {
-			if (game == GT_classicTwo) {
+			if (Game.type == GT_classicTwo) {
 				SendPacket(scr, NP_clear, 0, NULL);
 				if (linesCleared > 1) {
 					short junkLines;
@@ -347,7 +347,7 @@ void game_loop(void)
 				Message(Players[me].flags & SCF_paused
 					? "You are not ready" : "You are ready");
 			game_setpaused();
-			if (game == GT_classicTwo)
+			if (Game.type == GT_classicTwo)
 				SendPacket(me, NP_pause, 0, NULL);
 			ShowPause(me);
 			changed = 1;
@@ -387,7 +387,7 @@ void game_loop(void)
 		Message("<\\%d%s\\7> %s",
 			Players[me].team > 7 ? 7 : Players[me].team,
 			Players[me].name, chatText);
-		if (game == GT_classicTwo)
+		if (Game.type == GT_classicTwo)
 			SendPacket(me, NP_msg, strlen(chatText) + 1, chatText);
 	}
 
@@ -478,7 +478,7 @@ void game_loop(void)
 			gameStatus = 1; // drop
 			break;
 		case KT_faster:
-			if (game != GT_onePlayer) break;
+			if (Game.type != GT_onePlayer) break;
 			if ((Game.speed /= SPEEDINC) < SPEEDMINIMUM)
 				Game.speed = SPEEDMINIMUM;
 			SetITimer(Game.speed, SetITimer(0, 0));
@@ -702,7 +702,7 @@ void game_loop(void)
 				else Message("\\%d%s fragged you",
 					Players[lastadd].team > 7 ? 7 : Players[lastadd].team,
 					Players[lastadd].name);
-				if (game == GT_classicTwo)
+				if (Game.type == GT_classicTwo)
 					SendPacket(me, NP_argghhh, sizeof(lastadd), &lastadd);
 				ShowPause(me);
 				changed = 1;
@@ -769,7 +769,7 @@ int main(int argc, char **argv)
 {
 	char ch;
 
-	game = GT_onePlayer;
+	Game.type = GT_onePlayer;
 	port = DEFAULT_PORT;
 	maxPlayer = 1;
 	Game.initspeed = DEFAULT_INTERVAL;
@@ -812,7 +812,7 @@ int main(int argc, char **argv)
 
 	InitScreens();  //setup screen
 
-	if (game == GT_classicTwo) {
+	if (Game.type == GT_classicTwo) {
 		spied = 1;
 		InitiateConnection(hostStr, port);
 		HandShake();