team names defined in global include

Removes code duplication.

diff --git a/client.c b/client.c
index 344a4409091fe595feded89ad1d1a6890cabb6c9..926c08bdbcd06369ef78747ef4ebc759588f00a6 100644 (file)
--- a/client.c
+++ b/client.c
@@ -612,9 +612,6 @@ void game_loop(void)
                } //stop game
                case NP_newPlayer:
                {
                } //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);
                        if (net.uid>maxPlayer) maxPlayer = net.uid;
                        memcpy(&Players[net.uid], net.data, net.size);
                        ClearField(net.uid);


@@ -623,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,
                                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
                        if (Players[net.uid].flags & SCF_paused) {
                                game_setpaused();
                        } //player has paused

diff --git a/netris.h b/netris.h
index e04336eb138d8f3235056f6070eab3a89b7d24d1..6cc395ca2c9edb9b0db31e57afc7249a56646998 100644 (file)
--- a/netris.h
+++ b/netris.h
@@ -195,5 +195,10 @@ EXT _Game Game;
 
 EXT short port; // => just in client.c, parameter to inet connect
 
 
 EXT short port; // => just in client.c, parameter to inet connect
 

+static const char teamname[10][7] = {
+       "", "Green", "Cyan", "Blue", "Purple",
+       "Red", "Grey", "White", "*Orange"
+};
+

 #endif //__NETRIS_H
 
 #endif //__NETRIS_H
 

diff --git a/server.c b/server.c
index 3eebe8ae9a54eaa06f83a6eb86f80ad46c6ac122..814ac4e38c7dd744b649102ca6c4f4de5af4f99c 100644 (file)
--- a/server.c
+++ b/server.c
@@ -226,10 +226,6 @@ int StartServer(void)
        int playersReady = 0;
        bool paused = 1;
        int i;
        int playersReady = 0;
        bool paused = 1;
        int i;

-       char teams[10][7] = {
-               "", "Green", "Cyan", "Blue", "Purple",
-               "Red", "Grey", "White", "*Orange"
-       };

 
        do {
                switch (WaitMyEvent(&event, EM_any)) {
 
        do {
                switch (WaitMyEvent(&event, EM_any)) {


@@ -333,7 +329,7 @@ int StartServer(void)
                                                event.u.net.sender,
                                                Players[event.u.net.sender].name,
                                                Players[event.u.net.sender].host,
                                                event.u.net.sender,
                                                Players[event.u.net.sender].name,
                                                Players[event.u.net.sender].host,

-                                               teams[Players[event.u.net.sender].team]);
+                                               teamname[Players[event.u.net.sender].team]);

                                        if (++playersReady >= minplayers) {
                                                if (Game.started > 1)
                                                        SendPacketTo(event.u.net.sender, 0,
                                        if (++playersReady >= minplayers) {
                                                if (Game.started > 1)
                                                        SendPacketTo(event.u.net.sender, 0,