git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
team names defined in global include
[netris.git]
/
client.c
diff --git
a/client.c
b/client.c
index e3a2ffc8f63262a59854802d5856e75678276bda..926c08bdbcd06369ef78747ef4ebc759588f00a6 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-73,7
+73,7
@@
static char *cmds[] = {
};
static char *hostStr;
};
static char *hostStr;
-static
int
paused = 0;
+static
bool
paused = 0;
static char lastadd;
static char lastadd;
@@
-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 = 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)
}
void game_reset(void)
@@
-613,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);
@@
-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,
Message("%s joined the game", Players[net.uid].name);
else
Message("%s joined %s team", Players[net.uid].name,
- team
s
[Players[net.uid].team]);
+ team
name
[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