teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: Fix Y/N options with three lines

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8014 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-15 04:39:38 +00:00 committed by Christoph Oelckers
parent 98c4d8247f
commit 7bf4a722fb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/duke3d/src/menus.cpp
View file

@ -2292,14 +2292,14 @@ static void Menu_PreDrawBackground(MenuID_t cm, const vec2_t origin)
} }
static void Menu_DrawVerifyPrompt(int32_t x, int32_t y, const char * text) static void Menu_DrawVerifyPrompt(int32_t x, int32_t y, const char * text, int numlines = 1)
{ {
mgametextcenter(x, y + (90<<16), text); mgametextcenter(x, y + (90<<16), text);
#ifndef EDUKE32_ANDROID_MENU #ifndef EDUKE32_ANDROID_MENU
char const * inputs = CONTROL_LastSeenInput == LastSeenInput::Joystick char const * inputs = CONTROL_LastSeenInput == LastSeenInput::Joystick
? "Press (A) to accept, (B) to return." ? "Press (A) to accept, (B) to return."
: "(Y/N)"; : "(Y/N)";
mgametextcenter(x, y + (90<<16) + MF_Bluefont.get_yline(), inputs); mgametextcenter(x, y + (90<<16) + MF_Bluefont.get_yline() * numlines, inputs);
#endif #endif
} }
@ -2387,7 +2387,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
case MENU_RESETPLAYER: case MENU_RESETPLAYER:
videoFadeToBlack(1); videoFadeToBlack(1);
Bsprintf(tempbuf, "Load last game:\n\"%s\"", g_quickload->name); Bsprintf(tempbuf, "Load last game:\n\"%s\"", g_quickload->name);
Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf); Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf, 2);
break; break;
case MENU_LOAD: case MENU_LOAD:
@ -2529,7 +2529,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
if (g_oldSaveCnt) if (g_oldSaveCnt)
{ {
Bsprintf(tempbuf, "Delete %d obsolete saves?\nThis action cannot be undone.", g_oldSaveCnt); Bsprintf(tempbuf, "Delete %d obsolete saves?\nThis action cannot be undone.", g_oldSaveCnt);
Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf); Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf, 2);
} }
else else
mgametextcenter(origin.x, origin.y + (90<<16), "No obsolete saves found!"); mgametextcenter(origin.x, origin.y + (90<<16), "No obsolete saves found!");
@ -2543,7 +2543,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
if (msv.isOldVer && msv.brief.isExt) if (msv.isOldVer && msv.brief.isExt)
{ {
Bsprintf(tempbuf, "Resume game from sequence point:\n\"%s\"", msv.brief.name); Bsprintf(tempbuf, "Resume game from sequence point:\n\"%s\"", msv.brief.name);
Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf); Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf, 2);
} }
else if (msv.isOldVer) else if (msv.isOldVer)
{ {
@ -2552,13 +2552,13 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
#else #else
Bsprintf(tempbuf, "Start new game:\n%s / %s" Bsprintf(tempbuf, "Start new game:\n%s / %s"
, g_mapInfo[(ud.volume_number*MAXLEVELS) + ud.level_number].name, g_skillNames[ud.player_skill-1]); , g_mapInfo[(ud.volume_number*MAXLEVELS) + ud.level_number].name, g_skillNames[ud.player_skill-1]);
Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf); Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf, 2);
#endif #endif
} }
else else
{ {
Bsprintf(tempbuf, "Load game:\n\"%s\"", msv.brief.name); Bsprintf(tempbuf, "Load game:\n\"%s\"", msv.brief.name);
Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf); Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf, 2);
} }
break; break;
} }
@ -2574,7 +2574,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
videoFadeToBlack(1); videoFadeToBlack(1);
menusave_t & msv = cm == MENU_LOADDELVERIFY ? g_menusaves[M_LOAD.currentEntry] : g_menusaves[M_SAVE.currentEntry-1]; menusave_t & msv = cm == MENU_LOADDELVERIFY ? g_menusaves[M_LOAD.currentEntry] : g_menusaves[M_SAVE.currentEntry-1];
Bsprintf(tempbuf, "Delete saved game:\n\"%s\"?", msv.brief.name); Bsprintf(tempbuf, "Delete saved game:\n\"%s\"?", msv.brief.name);
Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf); Menu_DrawVerifyPrompt(origin.x, origin.y, tempbuf, 2);
break; break;
} }