Remove map.customtrinkets

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

View File

@@ -2245,11 +2245,13 @@ void maprender()
graphics.Print(185-12, 220, "[STATS]", 196, 196, 255 - help.glow);
graphics.Print(258, 220, "SAVE", 64, 64, 64);
if(map.custommode){
#if !defined(NO_CUSTOM_LEVELS)
if(map.custommode)
{
if (graphics.flipmode)
{
graphics.Print(0, 164, "[Trinkets found]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 152, help.number(game.trinkets()) + " out of " + help.number(map.customtrinkets), 96,96,96, true);
graphics.Print(0, 152, help.number(game.trinkets()) + " out of " + help.number(ed.numtrinkets), 96,96,96, true);
graphics.Print(0, 114, "[Number of Deaths]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 102,help.String(game.deathcounts), 96,96,96, true);
@@ -2260,7 +2262,7 @@ void maprender()
else
{
graphics.Print(0, 52, "[Trinkets found]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 64, help.number(game.trinkets()) + " out of "+help.number(map.customtrinkets), 96,96,96, true);
graphics.Print(0, 64, help.number(game.trinkets()) + " out of "+help.number(ed.numtrinkets), 96,96,96, true);
graphics.Print(0, 102, "[Number of Deaths]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 114,help.String(game.deathcounts), 96,96,96, true);
@@ -2268,7 +2270,10 @@ void maprender()
graphics.Print(0, 152, "[Time Taken]", 196, 196, 255 - help.glow, true);
graphics.Print(0, 164, game.timestring(), 96, 96, 96, true);
}
}else{
}
else
#endif
{
if (graphics.flipmode)
{
graphics.Print(0, 164, "[Trinkets found]", 196, 196, 255 - help.glow, true);