mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

De-duplicate menu tab rendering

Browse source 
Previously, the code to print all tab names was copied to every single
tab, resulting in 12 more superfluous print statements than needed. This
commit uses graphics.map_tab to de-duplicate all the code.
This commit is contained in:
Misa 2020-06-20 18:47:25 -07:00 committed by Ethan Lee
parent aa3c1c8053
commit 6876dbf70c
1 changed files with 19 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
desktop_version/src/Render.cpp
View file

@ -1648,25 +1648,36 @@ void maprender()
//Menubar: //Menubar:
graphics.drawtextbox( -10, 212, 42, 3, 65, 185, 207); graphics.drawtextbox( -10, 212, 42, 3, 65, 185, 207);
switch(game.menupage)
// Draw the selected page name at the bottom
// menupage 0 - 3 is the pause screen
if (game.menupage <= 3)
{ {
case 0: std::string tab1;
graphics.Print(30 - 8, 220, "[MAP]", 196, 196, 255 - help.glow);
if (game.insecretlab) if (game.insecretlab)
{ {
graphics.Print(103, 220, "GRAV", 64, 64, 64); tab1 = "GRAV";
} }
else if (obj.flags[67] && !map.custommode) else if (obj.flags[67] && !map.custommode)
{ {
graphics.Print(103, 220, "SHIP", 64,64,64); tab1 = "SHIP";
} }
else else
{ {
graphics.Print(103, 220, "CREW", 64,64,64); tab1 = "CREW";
} }
graphics.Print(185-4, 220, "STATS", 64,64,64); #define TAB(opt, text) graphics.map_tab(opt, text, game.menupage == opt)
graphics.Print(258, 220, "SAVE", 64,64,64); TAB(0, "MAP");
TAB(1, tab1);
TAB(2, "STATS");
TAB(3, "SAVE");
#undef TAB
}
// Draw the actual menu
switch(game.menupage)
{
case 0:
if (map.finalmode || (map.custommode&&!map.customshowmm)) if (map.finalmode || (map.custommode&&!map.customshowmm))
{ {
//draw the map image //draw the map image
@ -1866,11 +1877,6 @@ void maprender()
case 1: case 1:
if (game.insecretlab) if (game.insecretlab)
{ {
graphics.Print(30, 220, "MAP", 64,64,64);
graphics.Print(103-8, 220, "[GRAV]", 196, 196, 255 - help.glow);
graphics.Print(185-4, 220, "STATS", 64,64,64);
graphics.Print(258, 220, "SAVE", 64, 64, 64);
if (graphics.flipmode) if (graphics.flipmode)
{ {
graphics.Print(0, 174, "SUPER GRAVITRON HIGHSCORE", 196, 196, 255 - help.glow, true); graphics.Print(0, 174, "SUPER GRAVITRON HIGHSCORE", 196, 196, 255 - help.glow, true);
@ -1940,20 +1946,10 @@ void maprender()
} }
else if (obj.flags[67] && !map.custommode) else if (obj.flags[67] && !map.custommode)
{ {
graphics.Print(30, 220, "MAP", 64,64,64);
graphics.Print(103-8, 220, "[SHIP]", 196, 196, 255 - help.glow);
graphics.Print(185-4, 220, "STATS", 64,64,64);
graphics.Print(258, 220, "SAVE", 64, 64, 64);
graphics.Print(0, 105, "Press ACTION to warp to the ship.", 196, 196, 255 - help.glow, true); graphics.Print(0, 105, "Press ACTION to warp to the ship.", 196, 196, 255 - help.glow, true);
} }
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
else if(map.custommode){ else if(map.custommode){
graphics.Print(30, 220, "MAP", 64,64,64);
graphics.Print(103-8, 220, "[CREW]", 196, 196, 255 - help.glow);
graphics.Print(185-4, 220, "STATS", 64,64,64);
graphics.Print(258, 220, "SAVE", 64, 64, 64);
if (graphics.flipmode) if (graphics.flipmode)
{ {
graphics.bigprint( -1, 220-45, ed.ListOfMetaData[game.playcustomlevel].title, 196, 196, 255 - help.glow, true); graphics.bigprint( -1, 220-45, ed.ListOfMetaData[game.playcustomlevel].title, 196, 196, 255 - help.glow, true);
@ -1988,11 +1984,6 @@ void maprender()
#endif #endif
else else
{ {
graphics.Print(30, 220, "MAP", 64,64,64);
graphics.Print(103-8, 220, "[CREW]", 196, 196, 255 - help.glow);
graphics.Print(185-4, 220, "STATS", 64,64,64);
graphics.Print(258, 220, "SAVE", 64, 64, 64);
if (graphics.flipmode) if (graphics.flipmode)
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@ -2054,22 +2045,6 @@ void maprender()
} }
break; break;
case 2: case 2:
graphics.Print(30, 220, "MAP", 64,64,64);
if (game.insecretlab)
{
graphics.Print(103, 220, "GRAV", 64, 64, 64);
}
else if (obj.flags[67] && !map.custommode)
{
graphics.Print(103, 220, "SHIP", 64,64,64);
}
else
{
graphics.Print(103, 220, "CREW", 64,64,64);
}
graphics.Print(185-12, 220, "[STATS]", 196, 196, 255 - help.glow);
graphics.Print(258, 220, "SAVE", 64, 64, 64);
#if !defined(NO_CUSTOM_LEVELS) #if !defined(NO_CUSTOM_LEVELS)
if(map.custommode) if(map.custommode)
{ {
@ -2124,22 +2099,6 @@ void maprender()
} }
break; break;
case 3: case 3:
graphics.Print(30, 220, "MAP", 64,64,64);
if (game.insecretlab)
{
graphics.Print(103, 220, "GRAV", 64, 64, 64);
}
else if (obj.flags[67] && !map.custommode)
{
graphics.Print(103, 220, "SHIP", 64,64,64);
}
else
{
graphics.Print(103, 220, "CREW", 64,64,64);
}
graphics.Print(185-4, 220, "STATS", 64,64,64);
graphics.Print(258 - 8, 220, "[SAVE]", 196, 196, 255 - help.glow);
if (game.inintermission) if (game.inintermission)
{ {
graphics.Print(0, 115, "Cannot Save in Level Replay", 146, 146, 180, true); graphics.Print(0, 115, "Cannot Save in Level Replay", 146, 146, 180, true);