Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 01:48:15 +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

232
desktop_version/src/Game.cpp
View File

@@ -6551,8 +6551,9 @@ void Game::createmenu( enum Menu::MenuName t )
menucountdown = 0;
menuoptions.clear();
if (t == Menu::mainmenu)
switch (t)
{
case Menu::mainmenu:
#if !defined(MAKEANDPLAY)
option("start game");
#endif
@@ -6567,10 +6568,9 @@ void Game::createmenu( enum Menu::MenuName t )
option("quit game");
menuxoff = -16;
menuyoff = -10;
}
break;
#if !defined(NO_CUSTOM_LEVELS)
else if (t == Menu::playerworlds)
{
case Menu::playerworlds:
option("play a level");
#if !defined(NO_EDITOR)
option("level editor");
@@ -6579,9 +6579,8 @@ void Game::createmenu( enum Menu::MenuName t )
option("back to menu");
menuxoff = -30;
menuyoff = -40;
}
else if (t == Menu::levellist)
{
break;
case Menu::levellist:
if(ed.ListOfMetaData.size()==0)
{
option("ok");
@@ -6641,31 +6640,27 @@ void Game::createmenu( enum Menu::MenuName t )
menuxoff = -90;
menuyoff = 70-(menuoptions.size()*10);
}
}
break;
#endif
else if (t == Menu::quickloadlevel)
{
case Menu::quickloadlevel:
option("continue from save");
option("start from beginning");
option("back to levels");
menuxoff = -40;
menuyoff = -30;
}
else if (t == Menu::youwannaquit)
{
break;
case Menu::youwannaquit:
option("yes, quit");
option("no, return");
menuxoff = 0;
menuyoff = -20;
}
else if (t == Menu::errornostart)
{
break;
case Menu::errornostart:
option("ok");
menuxoff = 0;
menuyoff = -20;
}
else if (t == Menu::graphicoptions)
{
break;
case Menu::graphicoptions:
option("toggle fullscreen");
option("toggle letterbox");
option("toggle filter");
@@ -6674,9 +6669,8 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -50;
menuyoff = 8;
}
else if (t == Menu::ed_settings)
{
break;
case Menu::ed_settings:
option("change description");
option("edit scripts");
option("change music");
@@ -6686,9 +6680,8 @@ void Game::createmenu( enum Menu::MenuName t )
menuxoff = -50;
menuyoff = -20;
}
else if (t == Menu::ed_desc)
{
break;
case Menu::ed_desc:
option("change name");
option("change author");
option("change description");
@@ -6697,24 +6690,21 @@ void Game::createmenu( enum Menu::MenuName t )
menuxoff = -40;
menuyoff = 6;
}
else if (t == Menu::ed_music)
{
break;
case Menu::ed_music:
option("next song");
option("back");
menuxoff = -10;
menuyoff = 16;
}
else if (t == Menu::ed_quit)
{
break;
case Menu::ed_quit:
option("yes, save and quit");
option("no, quit without saving");
option("return to editor");
menuxoff = -50;
menuyoff = 8;
}
else if (t == Menu::options)
{
break;
case Menu::options:
option("accessibility options");
#if !defined(MAKEANDPLAY)
option("unlock play modes");
@@ -6729,9 +6719,8 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -40;
menuyoff = 0;
}
else if (t == Menu::accessibility)
{
break;
case Menu::accessibility:
option("animated backgrounds");
option("screen effects");
option("text outline");
@@ -6742,9 +6731,8 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -85;
menuyoff = -10;
}
else if(t == Menu::controller)
{
break;
case Menu::controller:
option("analog stick sensitivity");
option("bind flip");
option("bind enter");
@@ -6752,39 +6740,34 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -40;
menuyoff = 10;
}
else if (t == Menu::cleardatamenu)
{
break;
case Menu::cleardatamenu:
option("no! don't delete");
option("yes, delete everything");
menuxoff = -30;
menuyoff = 64;
}
else if (t == Menu::setinvincibility)
{
break;
case Menu::setinvincibility:
option("no, return to options");
option("yes, enable");
menuxoff = -30;
menuyoff = 64;
}
else if (t == Menu::setslowdown1)
{
break;
case Menu::setslowdown1:
option("no, return to options");
option("yes, delete saves");
menuxoff = -30;
menuyoff = 64;
}
else if (t == Menu::setslowdown2)
{
break;
case Menu::setslowdown2:
option("normal speed");
option("80% speed");
option("60% speed");
option("40% speed");
menuxoff = -40;
menuyoff = 16;
}
else if (t == Menu::unlockmenu)
{
break;
case Menu::unlockmenu:
option("unlock time trials");
option("unlock intermissions", !unlock[16]);
option("unlock no death mode", !unlock[17]);
@@ -6794,58 +6777,50 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -70;
menuyoff = -20;
}
else if (t == Menu::credits)
{
break;
case Menu::credits:
option("next page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::credits2)
{
break;
case Menu::credits2:
option("next page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::credits25)
{
break;
case Menu::credits25:
option("next page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::credits3)
{
break;
case Menu::credits3:
option("next page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::credits4)
{
break;
case Menu::credits4:
option("next page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::credits5)
{
break;
case Menu::credits5:
option("next page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::credits6)
{
break;
case Menu::credits6:
option("first page");
option("return");
menuxoff = 20;
menuyoff = 64;
}
else if (t == Menu::play)
{
break;
case Menu::play:
//Ok, here's where the unlock stuff comes into it:
//First up, time trials:
temp = 0;
@@ -6957,26 +6932,23 @@ void Game::createmenu( enum Menu::MenuName t )
}
}
}
}
else if (t == Menu::unlocktimetrial
|| t == Menu::unlocktimetrials
|| t == Menu::unlocknodeathmode
|| t == Menu::unlockintermission
|| t == Menu::unlockflipmode)
{
break;
case Menu::unlocktimetrial:
case Menu::unlocktimetrials:
case Menu::unlocknodeathmode:
case Menu::unlockintermission:
case Menu::unlockflipmode:
option("continue");
menuxoff = 20;
menuyoff = 70;
}
else if (t == Menu::newgamewarning)
{
break;
case Menu::newgamewarning:
option("start new game");
option("return to menu");
menuxoff = -30;
menuyoff = 64;
}
else if (t == Menu::playmodes)
{
break;
case Menu::playmodes:
option("time trials", !map.invincibility && game.slowdown == 30);
option("intermissions", unlock[16]);
option("no death mode", unlock[17] && !map.invincibility && game.slowdown == 30);
@@ -6984,17 +6956,15 @@ void Game::createmenu( enum Menu::MenuName t )
option("return to play menu");
menuxoff = -70;
menuyoff = 8;
}
else if (t == Menu::intermissionmenu)
{
break;
case Menu::intermissionmenu:
option("play intermission 1");
option("play intermission 2");
option("return to play menu");
menuxoff = -50;
menuyoff = -35;
}
else if (t == Menu::playint1)
{
break;
case Menu::playint1:
option("Vitellary");
option("Vermilion");
option("Verdigris");
@@ -7002,9 +6972,8 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -60;
menuyoff = 10;
}
else if (t == Menu::playint2)
{
break;
case Menu::playint2:
option("Vitellary");
option("Vermilion");
option("Verdigris");
@@ -7012,36 +6981,31 @@ void Game::createmenu( enum Menu::MenuName t )
option("return");
menuxoff = -60;
menuyoff = 10;
}
else if (t == Menu::continuemenu)
{
break;
case Menu::continuemenu:
option("continue from teleporter");
option("continue from quicksave");
option("return to play menu");
menuxoff = -60;
menuyoff = 20;
}
else if (t == Menu::startnodeathmode)
{
break;
case Menu::startnodeathmode:
option("disable cutscenes");
option("enable cutscenes");
option("return to play menu");
menuxoff = -60;
menuyoff = 40;
}
else if (t == Menu::gameover)
{
break;
case Menu::gameover:
menucountdown = 120;
menudest=Menu::gameover2;
}
else if (t == Menu::gameover2)
{
break;
case Menu::gameover2:
option("return to play menu");
menuxoff = -25;
menuyoff = 80;
}
else if (t == Menu::unlockmenutrials)
{
break;
case Menu::unlockmenutrials:
option("space station 1", !unlock[9]);
option("the laboratory", !unlock[10]);
option("the tower", !unlock[11]);
@@ -7052,9 +7016,8 @@ void Game::createmenu( enum Menu::MenuName t )
option("return to unlock menu");
menuxoff = -80;
menuyoff = 0;
}
else if (t == Menu::timetrials)
{
break;
case Menu::timetrials:
option(unlock[9] ? "space station 1" : "???", unlock[9]);
option(unlock[10] ? "the laboratory" : "???", unlock[10]);
option(unlock[11] ? "the tower" : "???", unlock[11]);
@@ -7065,40 +7028,35 @@ void Game::createmenu( enum Menu::MenuName t )
option("return to play menu");
menuxoff = -80;
menuyoff = 0;
}
else if (t == Menu::nodeathmodecomplete)
{
break;
case Menu::nodeathmodecomplete:
menucountdown = 90;
menudest = Menu::nodeathmodecomplete2;
}
else if (t == Menu::nodeathmodecomplete2)
{
break;
case Menu::nodeathmodecomplete2:
option("return to play menu");
menuxoff = -25;
menuyoff = 70;
}
else if (t == Menu::timetrialcomplete)
{
break;
case Menu::timetrialcomplete:
menucountdown = 90;
menudest=Menu::timetrialcomplete2;
}
else if (t == Menu::timetrialcomplete2)
{
break;
case Menu::timetrialcomplete2:
menucountdown = 60;
menudest=Menu::timetrialcomplete3;
}
else if (t == Menu::timetrialcomplete3)
{
break;
case Menu::timetrialcomplete3:
option("return to play menu");
option("try again");
menuxoff = -25;
menuyoff = 70;
}
else if (t == Menu::gamecompletecontinue)
{
break;
case Menu::gamecompletecontinue:
option("return to play menu");
menuxoff = -25;
menuyoff = 70;
break;
}
}