summaryrefslogtreecommitdiff
path: root/src/strife/hu_stuff.c
diff options
context:
space:
mode:
authorSimon Howard2010-09-09 23:13:06 +0000
committerSimon Howard2010-09-09 23:13:06 +0000
commit120d90c67b2a4aa0a8883c4897241dee2222acd2 (patch)
treeb439e48483ebbd698c2daa6e24eeaaab1ba97470 /src/strife/hu_stuff.c
parent79268587fc730e17cbd974a5583c7185604b59a3 (diff)
parent22fc405736dc4796958de221c07d52432f1b271b (diff)
downloadchocolate-doom-120d90c67b2a4aa0a8883c4897241dee2222acd2.tar.gz
chocolate-doom-120d90c67b2a4aa0a8883c4897241dee2222acd2.tar.bz2
chocolate-doom-120d90c67b2a4aa0a8883c4897241dee2222acd2.zip
Merge from raven-branch.
Subversion-branch: /branches/strife-branch Subversion-revision: 2051
Diffstat (limited to 'src/strife/hu_stuff.c')
-rw-r--r--src/strife/hu_stuff.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c
index 3ddf402e..0358bd63 100644
--- a/src/strife/hu_stuff.c
+++ b/src/strife/hu_stuff.c
@@ -178,7 +178,7 @@ void HU_Init(void)
j = HU_FONTSTART;
for (i=0;i<HU_FONTSIZE;i++)
{
- sprintf(buffer, DEH_String("STCFN%.3d"), j++);
+ DEH_snprintf(buffer, 9, "STCFN%.3d", j++);
hu_font[i] = (patch_t *) W_CacheLumpName(buffer, PU_STATIC);
}
@@ -383,14 +383,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;
@@ -419,7 +411,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);
@@ -429,7 +421,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)
{