mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-09 18:39:45 +01:00
Code Issues Releases Wiki Activity

Add and use Game::save_exists()

Browse source 
This is simply a shorthand for telesummary != "" || quicksummary != "",
to make it easier and less error-prone to negate. This improves
readability.
This commit is contained in:
Misa 2020-04-26 13:41:35 -07:00 committed by Ethan Lee
parent 7df42242e7
commit 197c7caf08
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop_version/src/Game.cpp
View file

@ -1357,7 +1357,7 @@ void Game::updatestate()
{ {
returntomenu(Menu::levellist); returntomenu(Menu::levellist);
} }
else if (telesummary != "" || quicksummary != "" || anything_unlocked()) else if (save_exists() || anything_unlocked())
{ {
returntomenu(Menu::play); returntomenu(Menu::play);
} }
@ -7031,7 +7031,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
} }
else else
{ {
if (telesummary != "" || quicksummary != "") if (save_exists())
{ {
option("continue"); option("continue");
} }
@ -7045,7 +7045,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("secret lab", !map.invincibility && slowdown == 30); option("secret lab", !map.invincibility && slowdown == 30);
} }
option("play modes"); option("play modes");
if (telesummary != "" || quicksummary != "") if (save_exists())
{ {
option("new game"); option("new game");
} }
@ -7346,3 +7346,8 @@ bool Game::anything_unlocked()
} }
return false; return false;
} }
bool Game::save_exists()
{
return telesummary != "" || quicksummary != "";
}

1
desktop_version/src/Game.h
View file

@ -328,6 +328,7 @@ public:
std::string activity_lastprompt; std::string activity_lastprompt;
std::string telesummary, quicksummary, customquicksummary; std::string telesummary, quicksummary, customquicksummary;
bool save_exists();
bool backgroundtext; bool backgroundtext;

8
desktop_version/src/Input.cpp
View file

@ -134,7 +134,7 @@ void menuactionpress()
#if !defined(MAKEANDPLAY) #if !defined(MAKEANDPLAY)
case 0: case 0:
//Play //Play
if (game.telesummary == "" && game.quicksummary == "" && !game.anything_unlocked()) if (!game.save_exists() && !game.anything_unlocked())
{ {
//No saves exist, just start a new game //No saves exist, just start a new game
game.mainmenu = 0; game.mainmenu = 0;
@ -950,12 +950,12 @@ void menuactionpress()
//Do we have the Secret Lab option? //Do we have the Secret Lab option?
int sloffset = game.unlock[8] ? 0 : -1; int sloffset = game.unlock[8] ? 0 : -1;
//Do we have a telesave or quicksave? //Do we have a telesave or quicksave?
int ngoffset = game.telesummary != "" || game.quicksummary != "" ? 0 : -1; int ngoffset = game.save_exists() ? 0 : -1;
if (game.currentmenuoption == 0) if (game.currentmenuoption == 0)
{ {
//continue //continue
//right, this depends on what saves you've got //right, this depends on what saves you've got
if (game.telesummary == "" && game.quicksummary == "") if (!game.save_exists())
{ {
//You have no saves but have something unlocked, or you couldn't have gotten here //You have no saves but have something unlocked, or you couldn't have gotten here
game.mainmenu = 0; game.mainmenu = 0;
@ -998,7 +998,7 @@ void menuactionpress()
game.createmenu(Menu::playmodes); game.createmenu(Menu::playmodes);
map.nexttowercolour(); map.nexttowercolour();
} }
else if (game.currentmenuoption == sloffset+3 && (game.telesummary != "" || game.quicksummary != "")) else if (game.currentmenuoption == sloffset+3 && game.save_exists())
{ {
//newgame //newgame
music.playef(11); music.playef(11);