AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 20:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Center setup menu title patches (#1801)

Browse Source 
* Center setup menu title patches

* Use M_X_CENTER macro for consistency
This commit is contained in:
Xemonix 2024-07-25 20:50:10 +03:00 committed by GitHub
parent cb53e63083
commit 1b3f85731e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mn_internal.h
View File

@ -70,6 +70,8 @@ boolean MN_PointInsideRect(mrect_t *rect, int x, int y);
void MN_ClearMenus(void); void MN_ClearMenus(void);
void MN_Back(void); void MN_Back(void);
#define M_X_CENTER (-1)
// [FG] alternative text for missing menu graphics lumps // [FG] alternative text for missing menu graphics lumps
void MN_DrawTitle(int x, int y, const char *patch, const char *alttext); void MN_DrawTitle(int x, int y, const char *patch, const char *alttext);
void MN_DrawStringCR(int cx, int cy, byte *cr1, byte *cr2, const char *ch); void MN_DrawStringCR(int cx, int cy, byte *cr1, byte *cr2, const char *ch);

4
src/mn_menu.c
View File

@ -1310,7 +1310,7 @@ static menu_t SoundDef = {sound_end, &MainDef, SoundMenu, M_DrawSound,
static void M_DrawSound(void) static void M_DrawSound(void)
{ {
MN_DrawTitle(60, 38, "M_SVOL", "Sound Volume"); MN_DrawTitle(M_X_CENTER, 38, "M_SVOL", "Sound Volume");
int index = highlight_item + 1; int index = highlight_item + 1;
menuitem_t *item = &currentMenu->menuitems[index]; menuitem_t *item = &currentMenu->menuitems[index];
@ -1873,7 +1873,7 @@ void MN_SetNextMenuAlt(ss_types type)
static void M_DrawSetup(void) static void M_DrawSetup(void)
{ {
MN_DrawTitle(108, 15, "M_OPTTTL", "OPTIONS"); MN_DrawTitle(M_X_CENTER, 15, "M_OPTTTL", "OPTIONS");
} }
///////////////////////////// /////////////////////////////

21
src/mn_setup.c
View File

@ -96,6 +96,7 @@ static boolean default_reset;
#define M_X 240 #define M_X 240
#define M_Y (29 + M_SPC) #define M_Y (29 + M_SPC)
#define M_Y_WARN (SCREENHEIGHT - 15) #define M_Y_WARN (SCREENHEIGHT - 15)
#define M_Y_TITLE 2
#define M_THRM_STEP 8 #define M_THRM_STEP 8
#define M_THRM_HEIGHT 13 #define M_THRM_HEIGHT 13
@ -1215,7 +1216,7 @@ void MN_DrawKeybnd(void)
// Set up the Key Binding screen // Set up the Key Binding screen
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(84, 2, "M_KEYBND", "Key Bindings"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_KEYBND", "Key Bindings");
DrawTabs(); DrawTabs();
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -1316,7 +1317,7 @@ void MN_DrawWeapons(void)
inhelpscreens = true; // killough 4/6/98: Force status bar redraw inhelpscreens = true; // killough 4/6/98: Force status bar redraw
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(109, 2, "M_WEAP", "Weapons"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_WEAP", "Weapons");
DrawTabs(); DrawTabs();
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -1545,7 +1546,7 @@ void MN_DrawStatusHUD(void)
inhelpscreens = true; // killough 4/6/98: Force status bar redraw inhelpscreens = true; // killough 4/6/98: Force status bar redraw
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(59, 2, "M_STAT", "Status Bar/HUD"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_STAT", "Status Bar/HUD");
DrawTabs(); DrawTabs();
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -1636,7 +1637,7 @@ void MN_DrawAutoMap(void)
inhelpscreens = true; // killough 4/6/98: Force status bar redraw inhelpscreens = true; // killough 4/6/98: Force status bar redraw
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(109, 2, "M_AUTO", "Automap"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_AUTO", "Automap");
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -1718,7 +1719,7 @@ void MN_DrawEnemy(void)
inhelpscreens = true; inhelpscreens = true;
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(114, 2, "M_ENEM", "Enemies"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_ENEM", "Enemies");
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -1812,7 +1813,7 @@ void MN_DrawCompat(void)
inhelpscreens = true; inhelpscreens = true;
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(52, 2, "M_COMPAT", "Compatibility"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_COMPAT", "Compatibility");
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -2456,7 +2457,7 @@ void MN_DrawGeneral(void)
inhelpscreens = true; inhelpscreens = true;
DrawBackground("FLOOR4_6"); // Draw background DrawBackground("FLOOR4_6"); // Draw background
MN_DrawTitle(114, 2, "M_GENERL", "General"); MN_DrawTitle(M_X_CENTER, M_Y_TITLE, "M_GENERL", "General");
DrawTabs(); DrawTabs();
DrawInstructions(); DrawInstructions();
DrawScreenItems(current_menu); DrawScreenItems(current_menu);
@ -2932,7 +2933,7 @@ void MN_DrawCredits(void) // killough 10/98: credit screen
M_snprintf(mbftext_s, sizeof(mbftext_s), PROJECT_STRING); M_snprintf(mbftext_s, sizeof(mbftext_s), PROJECT_STRING);
inhelpscreens = true; inhelpscreens = true;
DrawBackground(gamemode == shareware ? "CEIL5_1" : "MFLR8_4"); DrawBackground(gamemode == shareware ? "CEIL5_1" : "MFLR8_4");
MN_DrawTitle(42, 9, "MBFTEXT", mbftext_s); MN_DrawTitle(M_X_CENTER, 9, "MBFTEXT", mbftext_s);
DrawScreenItems(cred_settings); DrawScreenItems(cred_settings);
} }
@ -3818,7 +3819,9 @@ void MN_DrawTitle(int x, int y, const char *patch, const char *alttext)
if (patch_lump >= 0) if (patch_lump >= 0)
{ {
V_DrawPatch(x, y, V_CachePatchNum(patch_lump, PU_CACHE)); patch_t *patch = V_CachePatchNum(patch_lump, PU_CACHE);
V_DrawPatch(x == M_X_CENTER ? SCREENWIDTH / 2 - patch->width / 2 : x,
y, patch);
} }
else else
{ {