shithub: choc

Download patch

ref: 1a203c8eee521de027f0bb1eee1e93d8f6e17dec
parent: e7ae385752f8b9f601a44257d661c7ec25d266a5
author: James Haley <[email protected]>
date: Sat Feb 11 23:38:40 EST 2012 

* Correct an error in one of the beta-like Beggar internal dialogue
  strings (was missing a doubled space). These messages are used by only
  one guy in the game, and, as in vanilla, most of them don't appear
  correctly when output.
* Correct HUD behavior: do not reinit the HUD at the start of each map.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2503


--- a/src/strife/hu_stuff.c
+++ b/src/strife/hu_stuff.c
@@ -226,21 +226,11 @@
     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 @@
     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];
+            }
         }
+        */
     }
-    */
 }
 
 //
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -291,7 +291,7 @@
             "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"