Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Turn game.currentmenuname "else-if"s into case-switches

Browse Source 
Much more stylistic, you don't need to repeat "game.currentmenuname" for
each case, and you don't need to deal with the dangling first "if" that
doesn't have an "else".
This commit is contained in:
Misa
2020-04-16 15:19:17 -07:00
committed by Ethan Lee
parent ceb8d3f3d8
commit 9e99246e02
4 changed files with 280 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
desktop_version/src/editor.cpp
View File

@@ -2183,12 +2183,12 @@ void editorclass::generatecustomminimap()
void editormenurender(int tr, int tg, int tb)
{
if (game.currentmenuname == Menu::ed_settings)
switch (game.currentmenuname)
{
case Menu::ed_settings:
graphics.bigprint( -1, 75, "Map Settings", tr, tg, tb, true);
}
else if (game.currentmenuname==Menu::ed_desc)
{
break;
case Menu::ed_desc:
if(ed.titlemod)
{
if(ed.entframe<2)
@@ -2279,9 +2279,8 @@ void editormenurender(int tr, int tg, int tb)
{
graphics.Print( -1, 110, ed.Desc3, tr, tg, tb, true);
}
}
else if (game.currentmenuname == Menu::ed_music)
{
break;
case Menu::ed_music:
graphics.bigprint( -1, 65, "Map Music", tr, tg, tb, true);
graphics.Print( -1, 85, "Current map music:", tr, tg, tb, true);
@@ -2327,11 +2326,13 @@ void editormenurender(int tr, int tg, int tb)
graphics.Print( -1, 120, "?: something else", tr, tg, tb, true);
break;
}
}
else if (game.currentmenuname == Menu::ed_quit)
{
break;
case Menu::ed_quit:
graphics.bigprint( -1, 90, "Save before", tr, tg, tb, true);
graphics.bigprint( -1, 110, "quitting?", tr, tg, tb, true);
break;
default:
break;
}
}
@@ -3461,8 +3462,9 @@ void editorlogic()
void editormenuactionpress()
{
if (game.currentmenuname == Menu::ed_desc)
switch (game.currentmenuname)
{
case Menu::ed_desc:
switch (game.currentmenuoption)
{
case 0:
@@ -3495,9 +3497,8 @@ void editormenuactionpress()
map.nexttowercolour();
break;
}
}
else if (game.currentmenuname == Menu::ed_settings)
{
break;
case Menu::ed_settings:
switch (game.currentmenuoption)
{
case 0:
@@ -3560,9 +3561,8 @@ void editormenuactionpress()
map.nexttowercolour();
break;
}
}
else if (game.currentmenuname == Menu::ed_music)
{
break;
case Menu::ed_music:
switch (game.currentmenuoption)
{
case 0:
@@ -3588,9 +3588,8 @@ void editormenuactionpress()
map.nexttowercolour();
break;
}
}
else if (game.currentmenuname == Menu::ed_quit)
{
break;
case Menu::ed_quit:
switch (game.currentmenuoption)
{
case 0:
@@ -3622,6 +3621,9 @@ void editormenuactionpress()
map.nexttowercolour();
break;
}
break;
default:
break;
}
}