move game type to Game struct

diff --git a/client.c b/client.c
index b8b7eed3b47c735656f06f88d6fa65d4961e950c..e3a2ffc8f63262a59854802d5856e75678276bda 100644 (file)
--- 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();

diff --git a/inet.c b/inet.c
index 4300eb7afc072dbf322f2086defbc4ed3bf0692d..36ba001272e2ea35610ce8e81f9e54feee2b5708 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -113,7 +113,7 @@ void HandShake(void)
                        {
                                static struct {
                                        int playerflags;
-                                       int maxplayers;  //1
+                                       int gravity;     //1
                                        int started;     //2
                                        int continuous;  //3
                                        long seed;       //4
@@ -123,7 +123,7 @@ void HandShake(void)
                                memcpy(&data, event.u.net.data, event.u.net.size);
                                memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
                                memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
-                               memcpy(&Game, &data.maxplayers,
+                               memcpy(&Game.gravity, &data.gravity,
                                        sizeof(data) - sizeof(data.playerflags));
                                break;
                        } //NP_gamedata

diff --git a/netris.h b/netris.h
index af6841424fc00dcd1a9e9cbc6b5a2eeab98c7e4c..e04336eb138d8f3235056f6070eab3a89b7d24d1 100644 (file)
--- a/netris.h
+++ b/netris.h
@@ -78,7 +78,6 @@ typedef long netint4;
 #define EM_connect     000020
 #define EM_any         000777
 
-typedef enum _GameType { GT_onePlayer, GT_classicTwo, GT_len } GameType;
 typedef enum _BlockTypeA {
        BT_shadow, BT_none,
        BT_S, BT_L, BT_I, BT_O, BT_Z, BT_J, BT_T,
@@ -180,7 +179,9 @@ EXT int spied; //in player.flags
 #define SPEEDINC          1.2
 #define SPEEDMINIMUM      40000
 
+typedef enum _GameType { GT_onePlayer, GT_classicTwo, GT_len } GameType;
 typedef struct {
+       GameType type;
        int gravity;     //1
        int started;     //2
        int continuous;  //3
@@ -192,8 +193,6 @@ EXT _Game Game;
 
 #define MSG_WIDTH 128
 
-EXT GameType game; // => Game.type
-
 EXT short port; // => just in client.c, parameter to inet connect
 
 #endif //__NETRIS_H

diff --git a/server.c b/server.c
index 947c8e196029dc37d6c1a1722d386469d68ff36b..3d6652ac43118fb24fb4bf724a32ae9491b7d9fd 100644 (file)
--- a/server.c
+++ b/server.c
@@ -313,7 +313,7 @@ int StartServer(void)
 
                                                memcpy(&data, &Players[event.u.net.sender].flags,
                                                        sizeof(data.playerflags));
-                                               memcpy(&data.gravity, &Game,
+                                               memcpy(&data.gravity, &Game.gravity,
                                                        sizeof(data) - sizeof(data.playerflags));
                                                SendPacketTo(event.u.net.sender, 0, NP_gamedata,
                                                        sizeof(data), &data);