Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-31 02:14:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove map.customcrewmates

Browse Source 
Same as the previous commit, except for the amount of custom crewmates.
This commit is contained in:
Misa
2020-04-08 22:01:32 -07:00
committed by Ethan Lee
parent 85bd7d9a2d
commit 6b317c5ab9
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
desktop_version/src/Game.cpp
View File

@@ -1999,6 +1999,7 @@ void Game::updatestate()
state++;
statedelay = 15;
break;
#if !defined(NO_CUSTOM_LEVELS)
case 1011:
//Found a crewmate!
advancetext = true;
@@ -2010,17 +2011,17 @@ void Game::updatestate()
graphics.addline("You have found a lost crewmate!");
graphics.textboxcenterx();
if(int(map.customcrewmates-crewmates())==0)
if(int(ed.numcrewmates-crewmates())==0)
{
graphics.createtextbox(" All crewmates rescued! ", 50, 65, 174, 174, 174);
}
else if(map.customcrewmates-crewmates()==1)
else if(ed.numcrewmates-crewmates()==1)
{
graphics.createtextbox(" " + help.number(int(map.customcrewmates-crewmates()))+ " remains ", 50, 65, 174, 174, 174);
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remains ", 50, 65, 174, 174, 174);
}
else
{
graphics.createtextbox(" " + help.number(int(map.customcrewmates-crewmates()))+ " remain ", 50, 65, 174, 174, 174);
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remain ", 50, 65, 174, 174, 174);
}
graphics.textboxcenterx();
@@ -2032,22 +2033,21 @@ void Game::updatestate()
graphics.addline("You have found a lost crewmate!");
graphics.textboxcenterx();
if(int(map.customcrewmates-crewmates())==0)
if(int(ed.numcrewmates-crewmates())==0)
{
graphics.createtextbox(" All crewmates rescued! ", 50, 135, 174, 174, 174);
}
else if(map.customcrewmates-crewmates()==1)
else if(ed.numcrewmates-crewmates()==1)
{
graphics.createtextbox(" " + help.number(int(map.customcrewmates-crewmates()))+ " remains ", 50, 135, 174, 174, 174);
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remains ", 50, 135, 174, 174, 174);
}
else
{
graphics.createtextbox(" " + help.number(int(map.customcrewmates-crewmates()))+ " remain ", 50, 135, 174, 174, 174);
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remain ", 50, 135, 174, 174, 174);
}
graphics.textboxcenterx();
}
break;
#if !defined(NO_CUSTOM_LEVELS)
case 1013:
graphics.textboxremove();
hascontrol = true;
@@ -2055,7 +2055,7 @@ void Game::updatestate()
completestop = false;
state = 0;
if(map.customcrewmates-crewmates()==0)
if(ed.numcrewmates-crewmates()==0)
{
if(map.custommodeforreal)
{
@@ -2090,10 +2090,10 @@ void Game::updatestate()
music.play(6);
graphics.backgrounddrawn = true;
map.tdrawback = true;
//Update level stats
if(map.customcrewmates-crewmates()==0)
{
#if !defined(NO_CUSTOM_LEVELS)
//Update level stats
if(ed.numcrewmates-crewmates()==0)
{
//Finished level
if(ed.numtrinkets-trinkets()==0)
{
@@ -2101,11 +2101,11 @@ void Game::updatestate()
updatecustomlevelstats(customlevelfilename, 3);
}
else
#endif
{
updatecustomlevelstats(customlevelfilename, 1);
}
}
#endif
createmenu("levellist");
state = 0;
break;