From 93d1d285b606413a0c60905f8b43389661ac30ec Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 5 Mar 2007 19:28:05 +0100 Subject: [PATCH] team names defined in global include Removes code duplication. --- client.c | 5 +---- netris.h | 5 +++++ server.c | 6 +----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/client.c b/client.c index 344a440..926c08b 100644 --- a/client.c +++ b/client.c @@ -612,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); @@ -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, - teams[Players[net.uid].team]); + teamname[Players[net.uid].team]); if (Players[net.uid].flags & SCF_paused) { game_setpaused(); } //player has paused diff --git a/netris.h b/netris.h index e04336e..6cc395c 100644 --- a/netris.h +++ b/netris.h @@ -195,5 +195,10 @@ EXT _Game Game; 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 diff --git a/server.c b/server.c index 3eebe8a..814ac4e 100644 --- a/server.c +++ b/server.c @@ -226,10 +226,6 @@ int StartServer(void) 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)) { @@ -333,7 +329,7 @@ int StartServer(void) 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, -- 2.30.0