From a078512cb2e78dfb67a5e2564d9168fffe830c68 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 5 Mar 2007 11:44:55 +0100 Subject: [PATCH] boolean pause state --- client.c | 5 ++--- server.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client.c b/client.c index e3a2ffc..344a440 100644 --- 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; @@ -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) diff --git a/server.c b/server.c index 3d6652a..b30ba02 100644 --- a/server.c +++ b/server.c @@ -21,6 +21,7 @@ #include "netris.h" #include +#include #include #include #include @@ -222,7 +223,7 @@ int StartServer(void) MyEvent event; netint2 currentpiece[MAX_SCREENS]; int playersReady = 0; - int paused = 1; + bool paused = 1; int i; char teams[10][7] = { "", "Green", "Cyan", "Blue", "Purple", @@ -360,10 +361,9 @@ int StartServer(void) paused = Game.started < 1; for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive > 0) - paused |= Players[i].flags & SCF_paused; + paused |= (Players[i].flags & SCF_paused) != 0; fprintf(stderr, "* Player #%d (un)paused (pause=%d)\n", event.u.net.sender, paused); - if (paused) paused = 1; goto sendtoall; } //NP_pause default: //relay data to all players -- 2.30.0