From 9b2fe3182d7ea427be679fa1c05c345169960e0e Mon Sep 17 00:00:00 2001 From: SinnamonLat Date: Tue, 24 May 2022 01:07:15 +0200 Subject: [PATCH] Can open chat again. Also fix missing braces in menudef... --- src/hu_stuff.c | 6 ++---- src/k_menudef.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 078257701..94b715298 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -1241,8 +1241,7 @@ boolean HU_Responder(event_t *ev) if (!chat_on) { // enter chat mode -#if 0 - if ((ev->data1 == gamecontrol[0][gc_talkkey][0] || ev->data1 == gamecontrol[0][gc_talkkey][1]) + if ((ev->data1 == gamecontrol[0][gc_talk][0] || ev->data1 == gamecontrol[0][gc_talk][1]) && netgame && !OLD_MUTE) // check for old chat mute, still let the players open the chat incase they want to scroll otherwise. { chat_on = true; @@ -1252,7 +1251,7 @@ boolean HU_Responder(event_t *ev) typelines = 1; return true; } - if ((ev->data1 == gamecontrol[0][gc_teamkey][0] || ev->data1 == gamecontrol[0][gc_teamkey][1]) + if ((ev->data1 == gamecontrol[0][gc_teamtalk][0] || ev->data1 == gamecontrol[0][gc_teamtalk][1]) && netgame && !OLD_MUTE) { chat_on = true; @@ -1262,7 +1261,6 @@ boolean HU_Responder(event_t *ev) typelines = 1; return true; } -#endif } else // if chat_on { diff --git a/src/k_menudef.c b/src/k_menudef.c index 0188f7b34..9e1ff9c96 100644 --- a/src/k_menudef.c +++ b/src/k_menudef.c @@ -315,7 +315,7 @@ menuitem_t PLAY_MP_JoinIP[] = NULL, {.cvar = &cv_dummyip}, 0, 0}, {IT_STRING, "CONNECT ", "Attempt to connect to the server you entered the IP for.", - NULL, NULL, 0, 0}, + NULL, {NULL}, 0, 0}, {IT_STRING | IT_SPACE, "LAST IPs JOINED:", "Kanade best waifu :)", NULL, {NULL}, 0, 0},