team names defined in global include

[netris.git] / client.c

diff --git a/client.c b/client.c
index b8b7eed3b47c735656f06f88d6fa65d4961e950c..926c08bdbcd06369ef78747ef4ebc759588f00a6 100644 (file)
--- 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;
 
 
@@ -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
@@ -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)
@@ -288,7 +287,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 +300,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 +346,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 +386,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 +477,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));
@@ -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
@@ -702,7 +698,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 +765,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 +808,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();