diff options
| author | Simon Howard | 2009-06-12 00:23:33 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-06-12 00:23:33 +0000 |
| commit | 0f5de61b743fdf05335436c1c71b4b488870483f (patch) | |
| tree | 43eca2de9916341a75148e681e73fff20299d9e8 /src/doom/g_game.c | |
| parent | ec03448333ca4c1d996dcb2b9c9ac01522a271bd (diff) | |
| parent | 43748a366a4bc5494c15995273bfe158530e03de (diff) | |
| download | chocolate-doom-0f5de61b743fdf05335436c1c71b4b488870483f.tar.gz chocolate-doom-0f5de61b743fdf05335436c1c71b4b488870483f.tar.bz2 chocolate-doom-0f5de61b743fdf05335436c1c71b4b488870483f.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1596
Diffstat (limited to 'src/doom/g_game.c')
| -rw-r--r-- | src/doom/g_game.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/doom/g_game.c b/src/doom/g_game.c index 5d49c5b4..35bf4d74 100644 --- a/src/doom/g_game.c +++ b/src/doom/g_game.c @@ -730,13 +730,15 @@ boolean G_Responder (event_t* ev) switch (ev->type) { case ev_keydown: - if (ev->data1 == KEY_PAUSE) + if (ev->data1 == key_pause) { sendpause = true; - return true; - } - if (ev->data1 <NUMKEYS) + } + else if (ev->data1 <NUMKEYS) + { gamekeydown[ev->data1] = true; + } + return true; // eat key down events case ev_keyup: |