zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: Improve text position over save/load screenshots.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6702 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-02-26 14:46:44 +00:00
parent 5bb5612cba
commit d155564975
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2198,7 +2198,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
if (M_LOAD.currentEntry >= (int32_t)g_nummenusaves) if (M_LOAD.currentEntry >= (int32_t)g_nummenusaves)
{ {
mmenutext(origin.x + (72<<16), origin.y + (100<<16), "Empty"); menutext_centeralign(origin.x + (101<<16), origin.y + (97<<16), "Empty");
break; break;
} }
@ -2210,8 +2210,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
if (msv.isOldVer) if (msv.isOldVer)
{ {
mmenutext(origin.x + (53<<16), origin.y + (70<<16), "Previous"); menutext_centeralign(origin.x + (101<<16), origin.y + (97<<16), "Previous\nVersion");
mmenutext(origin.x + (58<<16), origin.y + (90<<16), "Version");
#ifndef EDUKE32_SIMPLE_MENU #ifndef EDUKE32_SIMPLE_MENU
Bsprintf(tempbuf,"Saved: %d.%d.%d %d-bit", savehead.majorver, savehead.minorver, Bsprintf(tempbuf,"Saved: %d.%d.%d %d-bit", savehead.majorver, savehead.minorver,
@ -2271,8 +2270,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
if (g_menusaves[M_SAVE.currentEntry-1].isOldVer) if (g_menusaves[M_SAVE.currentEntry-1].isOldVer)
{ {
mmenutext(origin.x + (53<<16), origin.y + (70<<16), "Previous"); menutext_centeralign(origin.x + (101<<16), origin.y + (97<<16), "Previous\nVersion");
mmenutext(origin.x + (58<<16), origin.y + (90<<16), "Version");
#ifndef EDUKE32_SIMPLE_MENU #ifndef EDUKE32_SIMPLE_MENU
Bsprintf(tempbuf,"Saved: %d.%d.%d %d-bit", savehead.majorver, savehead.minorver, Bsprintf(tempbuf,"Saved: %d.%d.%d %d-bit", savehead.majorver, savehead.minorver,
@ -2288,7 +2286,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
} }
} }
else else
mmenutext(origin.x + (82<<16), origin.y + (100<<16), "New"); menutext_centeralign(origin.x + (101<<16), origin.y + (97<<16), "New");
if (ud.multimode > 1) if (ud.multimode > 1)
{ {

1
source/duke3d/src/screentext.h
View file

@ -72,6 +72,7 @@ extern int32_t textsc(int32_t sc);
#define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb) #define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb)
#define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb) #define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb)
#define menutext(x, y, t) menutext_((x), (y), 0, (t), 10|16, 0) #define menutext(x, y, t) menutext_((x), (y), 0, (t), 10|16, 0)
#define menutext_centeralign(x, y, t) menutext_((x), (y), 0, (t), 10|16, TEXT_XCENTER|TEXT_YCENTER)
#define menutext_center(y, t) menutext_(160<<16, (y)<<16, 0, (t), 10|16, TEXT_XCENTER) #define menutext_center(y, t) menutext_(160<<16, (y)<<16, 0, (t), 10|16, TEXT_XCENTER)
#define gametext(x, y, t) gametext_simple((x)<<16, (y)<<16, (t)) #define gametext(x, y, t) gametext_simple((x)<<16, (y)<<16, (t))
#define gametext_widenumber(x, y, t) gametext_((x)<<16, (y)<<16, (t), 0, MF_Bluefont.pal, 1024, 0, TEXT_GAMETEXTNUMHACK) #define gametext_widenumber(x, y, t) gametext_((x)<<16, (y)<<16, (t), 0, MF_Bluefont.pal, 1024, 0, TEXT_GAMETEXTNUMHACK)