check for game in pause command itself
authorMischa POSLAWSKY <netris@shiar.org>
Mon, 5 Mar 2007 07:03:14 +0000 (08:03 +0100)
committerMischa POSLAWSKY <netris@shiar.org>
Mon, 5 Mar 2007 07:03:14 +0000 (08:03 +0100)
So /pause works correctly as well.

client.c

index 61104458425e2bf52dccd79fc936f6f49d1ff0d0..47916fc27cdf9d5a14259da20115c496fe7e5fa0 100644 (file)
--- a/client.c
+++ b/client.c
@@ -346,6 +346,7 @@ void OneGame(void)
                        gameStatus = 0;
                        return;
                case CT_pause:
+                       if (Players[me].alive <= 0) return;
                        Players[me].flags ^= SCF_paused;
                        if (Game.started > 1)
                                Message(Players[me].flags & SCF_paused
@@ -449,14 +450,13 @@ void OneGame(void)
                // global actions (always possible, even if not playing)
                if (handle_key(key)) return;
 
-               if (Players[me].alive <= 0) return;
                // actions available while in game
                switch (key) {
                case KT_pause:
                        return handle_cmd(CT_pause, NULL);
                }
 
-               if (paused) return;
+               if (Players[me].alive <= 0 || paused) return;
                // actions only available while actually playing
                switch (key) {
                case KT_left: