git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pause key not special cased, but as any other command key
[netris.git]
/
client.c
diff --git
a/client.c
b/client.c
index 61104458425e2bf52dccd79fc936f6f49d1ff0d0..c4de9b1f5c89494f21c39d57d9b1d13a9d3589fb 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-346,6
+346,7
@@
void OneGame(void)
gameStatus = 0;
return;
case CT_pause:
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
Players[me].flags ^= SCF_paused;
if (Game.started > 1)
Message(Players[me].flags & SCF_paused
@@
-442,6
+443,9
@@
void OneGame(void)
case KT_quit:
handle_cmd(CT_quit, NULL);
return 1;
case KT_quit:
handle_cmd(CT_quit, NULL);
return 1;
+ case KT_pause:
+ handle_cmd(CT_pause, NULL);
+ return 1;
default:
return 0;
}
default:
return 0;
}
@@
-449,14
+453,7
@@
void OneGame(void)
// global actions (always possible, even if not playing)
if (handle_key(key)) return;
// 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:
// actions only available while actually playing
switch (key) {
case KT_left: