ref: 8346759db341c7ac93d62a18577f16357d25752e
parent: fba442882b900a4b963f4554b37cc6704a05966a
author: James Haley <haleyjd@hotmail.com>
date: Tue Sep 28 01:52:19 EDT 2010
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
--- a/src/strife/hu_lib.c
+++ b/src/strife/hu_lib.c
@@ -44,8 +44,6 @@
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
//
--- 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.
@@ -66,6 +67,9 @@
// haleyjd [STRIFE] externalized:
extern char *mapnames[];
+
+// [STRIFE]
+extern patch_t* yfont[HU_FONTSIZE]; // haleyjd 09/18/10: [STRIFE]
#endif
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -1464,14 +1464,10 @@
char *message = str; // edi
char bl; // bl
- /*
- STRIFE-TODO:
if(useyfont)
fontarray = yfont;
else
fontarray = hu_font;
- */
- fontarray = hu_font;
bl = toupper(*message);
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -1402,7 +1402,7 @@
jumptoconv = currentdialog->jumptoconv;
}
- M_DialogDimMsg(20, 28, currentdialog->text, 0);
+ M_DialogDimMsg(20, 28, currentdialog->text, false);
dialogtext = P_DialogGetMsg(currentdialog->text);
// get states
--- 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 @@
{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);
}