diff options
Diffstat (limited to 'src/strife')
| -rw-r--r-- | src/strife/hu_stuff.c | 72 | ||||
| -rw-r--r-- | src/strife/p_dialog.c | 2 |
2 files changed, 40 insertions, 34 deletions
diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c index ab973e8d..d01b8bfa 100644 --- a/src/strife/hu_stuff.c +++ b/src/strife/hu_stuff.c @@ -226,21 +226,11 @@ void HU_Start(void) int i; char* s; - if (headsupactive) - HU_Stop(); - - plr = &players[consoleplayer]; - message_on = false; - message_dontfuckwithme = false; - message_nottobefuckedwith = false; - chat_on = false; - - // create the message widget - HUlib_initSText(&w_message, - HU_MSGX, HU_MSGY, HU_MSGHEIGHT, - hu_font, - HU_FONTSTART, &message_on); - + // haleyjd 20120211: [STRIFE] not called here. + //if (headsupactive) + // HU_Stop(); + + // haleyjd 20120211: [STRIFE] moved up // create the map title widget HUlib_initTextLine(&w_title, HU_TITLEX, HU_TITLEY, @@ -258,31 +248,47 @@ void HU_Start(void) while (*s) HUlib_addCharToTextLine(&w_title, *(s++)); - // create the chat widget - HUlib_initIText(&w_chat, - HU_INPUTX, HU_INPUTY, - hu_font, - HU_FONTSTART, &chat_on); + // haleyjd 20120211: [STRIFE] check for headsupactive + if(!headsupactive) + { + plr = &players[consoleplayer]; + message_on = false; + message_dontfuckwithme = false; + message_nottobefuckedwith = false; + chat_on = false; - // create the inputbuffer widgets - for (i=0 ; i<MAXPLAYERS ; i++) - HUlib_initIText(&w_inputbuffer[i], 0, 0, 0, 0, &always_off); + // create the message widget + HUlib_initSText(&w_message, + HU_MSGX, HU_MSGY, HU_MSGHEIGHT, + hu_font, + HU_FONTSTART, &message_on); - headsupactive = true; + // create the chat widget + HUlib_initIText(&w_chat, + HU_INPUTX, HU_INPUTY, + hu_font, + HU_FONTSTART, &chat_on); - // haleyjd 09/18/10: [STRIFE] nickname weirdness. + // create the inputbuffer widgets + for (i=0 ; i<MAXPLAYERS ; i++) + HUlib_initIText(&w_inputbuffer[i], 0, 0, 0, 0, &always_off); - // STRIFE-TODO: This shit crashes the game. - /* - if(nickname != pnameprefixes[consoleplayer]) - { - if(*nickname) + headsupactive = true; + + // haleyjd 09/18/10: [STRIFE] nickname weirdness. + + // STRIFE-TODO: This shit crashes the game. + /* + if(nickname != pnameprefixes[consoleplayer]) { - DEH_printf("have one\n"); - nickname = pnameprefixes[consoleplayer]; + if(*nickname) + { + DEH_printf("have one\n"); + nickname = pnameprefixes[consoleplayer]; + } } + */ } - */ } // diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c index 88c01f16..0fa31854 100644 --- a/src/strife/p_dialog.c +++ b/src/strife/p_dialog.c @@ -291,7 +291,7 @@ static rndmessage_t rndMessages[] = "ONE DAY EVERYONE BUT THOSE WHO SERVE THE ORDER WILL BE FORCED TO "
" JOIN US.",
- "STARE NOW, BUT YOU KNOW THAT THIS WILL BE YOUR OWN FACE ONE DAY.",
+ "STARE NOW, BUT YOU KNOW THAT THIS WILL BE YOUR OWN FACE ONE DAY.",
// Note: "NOTHING THING" is an authentic typo
"THERE'S NOTHING THING MORE \n"
|