diff options
| author | Simon Howard | 2010-08-31 19:26:32 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-08-31 19:26:32 +0000 |
| commit | 22fc405736dc4796958de221c07d52432f1b271b (patch) | |
| tree | c05962aa5e839566ea40dd9b1f4ba3581954af8a /src/doom/hu_stuff.c | |
| parent | f391d85c96afa91a2302c58191ce8d401fdba2e2 (diff) | |
| parent | 64918568eee62c73cbb87aa1bd68e191f19a4af3 (diff) | |
| download | chocolate-doom-22fc405736dc4796958de221c07d52432f1b271b.tar.gz chocolate-doom-22fc405736dc4796958de221c07d52432f1b271b.tar.bz2 chocolate-doom-22fc405736dc4796958de221c07d52432f1b271b.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1987
Diffstat (limited to 'src/doom/hu_stuff.c')
| -rw-r--r-- | src/doom/hu_stuff.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/doom/hu_stuff.c b/src/doom/hu_stuff.c index 3337f978..f9271b3d 100644 --- a/src/doom/hu_stuff.c +++ b/src/doom/hu_stuff.c @@ -529,14 +529,6 @@ boolean HU_Responder(event_t *ev) int i; int numplayers; - static char destination_keys[MAXPLAYERS] = - { - HUSTR_KEYGREEN, - HUSTR_KEYINDIGO, - HUSTR_KEYBROWN, - HUSTR_KEYRED - }; - static int num_nobrainers = 0; numplayers = 0; @@ -565,7 +557,7 @@ boolean HU_Responder(event_t *ev) message_counter = HU_MSGTIMEOUT; eatkey = true; } - else if (netgame && ev->data2 == HU_INPUTTOGGLE) + else if (netgame && ev->data2 == key_multi_msg) { eatkey = chat_on = true; HUlib_resetIText(&w_chat); @@ -575,7 +567,7 @@ boolean HU_Responder(event_t *ev) { for (i=0; i<MAXPLAYERS ; i++) { - if (ev->data2 == destination_keys[i]) + if (ev->data2 == key_multi_msgplayer[i]) { if (playeringame[i] && i!=consoleplayer) { |