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 | |
| 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')
| -rw-r--r-- | src/doom/g_game.c | 10 | ||||
| -rw-r--r-- | src/doom/hu_stuff.c | 4 | ||||
| -rw-r--r-- | src/doom/hu_stuff.h | 1 |
3 files changed, 8 insertions, 7 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: diff --git a/src/doom/hu_stuff.c b/src/doom/hu_stuff.c index 7cd06bd5..a106978e 100644 --- a/src/doom/hu_stuff.c +++ b/src/doom/hu_stuff.c @@ -37,6 +37,7 @@ #include "hu_stuff.h" #include "hu_lib.h" +#include "m_controls.h" #include "w_wad.h" #include "s_sound.h" @@ -89,7 +90,6 @@ char* player_names[] = HUSTR_PLRRED }; - char chat_char; // remove later. static player_t* plr; patch_t* hu_font[HU_FONTSIZE]; @@ -555,7 +555,7 @@ boolean HU_Responder(event_t *ev) if (!chat_on) { - if (ev->data1 == HU_MSGREFRESH) + if (ev->data1 == key_message_refresh) { message_on = true; message_counter = HU_MSGTIMEOUT; diff --git a/src/doom/hu_stuff.h b/src/doom/hu_stuff.h index 26bc92ee..2e56f763 100644 --- a/src/doom/hu_stuff.h +++ b/src/doom/hu_stuff.h @@ -40,7 +40,6 @@ #define HU_BROADCAST 5 -#define HU_MSGREFRESH KEY_ENTER #define HU_MSGX 0 #define HU_MSGY 0 #define HU_MSGWIDTH 64 // in characters |