Enable useyfont parameter of M_DialogDimMsg for proper dimensioning of

mission objective text. Fix for implicit declaration warning on
HUlib_drawYellowText in m_menu.c.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2147

5 files changed, 8 insertions, 8 deletions

diff --git a/src/strife/hu_lib.c b/src/strife/hu_lib.c
index dee1dbea..989c921b 100644
--- a/src/strife/hu_lib.c
+++ b/src/strife/hu_lib.c
@@ -44,8 +44,6 @@ extern boolean	automapactive;	// in AM_map.c
 
 extern boolean D_PatchClipCallback(patch_t *patch, int x, int y); // [STRIFE]
 
-extern patch_t* yfont[HU_FONTSIZE];   // haleyjd 09/18/10: [STRIFE]
-
 //
 // HUlib_drawYellowText
 //
diff --git a/src/strife/hu_stuff.h b/src/strife/hu_stuff.h
index 6986a143..e245a42c 100644
--- a/src/strife/hu_stuff.h
+++ b/src/strife/hu_stuff.h
@@ -27,6 +27,7 @@
 #define __HU_STUFF_H__
 
 #include "d_event.h"
+#include "v_patch.h"
 
 //
 // Globally visible constants.
@@ -67,5 +68,8 @@ extern char pnameprefixes[8][16];   // villsa [STRIFE]
 // haleyjd [STRIFE] externalized:
 extern char *mapnames[];
 
+// [STRIFE]
+extern patch_t* yfont[HU_FONTSIZE];   // haleyjd 09/18/10: [STRIFE]
+
 #endif
 
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index c29b9fb5..84d37129 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -1464,14 +1464,10 @@ void M_DialogDimMsg(int x, int y, char *str, boolean useyfont)
     char *message = str;  // edi
     char  bl;             // bl
 
-    /*
-    STRIFE-TODO:
     if(useyfont)
        fontarray = yfont;
     else
        fontarray = hu_font;
-    */
-    fontarray = hu_font;
 
     bl = toupper(*message);
 
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index 5095afce..7b993f8d 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -1402,7 +1402,7 @@ void P_DialogStart(player_t *player)
         jumptoconv = currentdialog->jumptoconv;

     }

 

-    M_DialogDimMsg(20, 28, currentdialog->text, 0);

+    M_DialogDimMsg(20, 28, currentdialog->text, false);

     dialogtext = P_DialogGetMsg(currentdialog->text);

 

     // get states

diff --git a/src/strife/st_stuff.c b/src/strife/st_stuff.c
index f8f92d67..57b099ef 100644
--- a/src/strife/st_stuff.c
+++ b/src/strife/st_stuff.c
@@ -69,6 +69,8 @@
 #include "dstrings.h"
 #include "sounds.h"
 #include "m_controls.h"
+#include "hu_lib.h"     // [STRIFE]
+#include "hu_stuff.h"
 
 //
 // STATUS BAR DATA
@@ -1254,7 +1256,7 @@ boolean ST_DrawExternal(void)
     {
         V_DrawXlaPatch(0, 56, invpbak2);
         V_DrawPatchDirect(0, 56, invpop2);
-        M_DialogDimMsg(24, 74, mission_objective, 1);
+        M_DialogDimMsg(24, 74, mission_objective, true);
         HUlib_drawYellowText(24, 74, mission_objective);
         ST_drawTime(210, 64, leveltime / TICRATE);
     }