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

Remove map.customtrinkets

Browse Source 
This variable's sole purpose is to copy ed.numtrinkets, even though ed
has always been a name that's been accessible globally. So let's not
dupe cope.
This commit is contained in:
Misa
2020-04-08 21:56:47 -07:00
committed by Ethan Lee
parent c077e51fb4
commit 85bd7d9a2d
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop_version/src/Game.cpp
View File

@@ -1947,12 +1947,14 @@ void Game::updatestate()
graphics.addline("You have found a shiny trinket!");
graphics.textboxcenterx();
#if !defined(NO_CUSTOM_LEVELS)
if(map.custommode)
{
graphics.createtextbox(" " + help.number(trinkets()) + " out of " + help.number(map.customtrinkets)+ " ", 50, 65, 174, 174, 174);
graphics.createtextbox(" " + help.number(trinkets()) + " out of " + help.number(ed.numtrinkets)+ " ", 50, 65, 174, 174, 174);
graphics.textboxcenterx();
}
else
#endif
{
graphics.createtextbox(" " + help.number(trinkets()) + " out of Twenty ", 50, 65, 174, 174, 174);
graphics.textboxcenterx();
@@ -1965,12 +1967,14 @@ void Game::updatestate()
graphics.addline("You have found a shiny trinket!");
graphics.textboxcenterx();
#if !defined(NO_CUSTOM_LEVELS)
if(map.custommode)
{
graphics.createtextbox(" " + help.number(trinkets()) + " out of " + help.number(map.customtrinkets)+ " ", 50, 135, 174, 174, 174);
graphics.createtextbox(" " + help.number(trinkets()) + " out of " + help.number(ed.numtrinkets)+ " ", 50, 135, 174, 174, 174);
graphics.textboxcenterx();
}
else
#endif
{
graphics.createtextbox(" " + help.number(trinkets()) + " out of Twenty ", 50, 135, 174, 174, 174);
graphics.textboxcenterx();
@@ -2089,13 +2093,15 @@ void Game::updatestate()
//Update level stats
if(map.customcrewmates-crewmates()==0)
{
#if !defined(NO_CUSTOM_LEVELS)
//Finished level
if(map.customtrinkets-trinkets()==0)
if(ed.numtrinkets-trinkets()==0)
{
//and got all the trinkets!
updatecustomlevelstats(customlevelfilename, 3);
}
else
#endif
{
updatecustomlevelstats(customlevelfilename, 1);
}