mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Remove unnecessary int casts relating to custom crewmate numbers

Browse source 
I don't know why these are here, but there's never a point where these
integers were at any risk of no longer being integers.
This commit is contained in:
Misa 2020-04-08 22:03:41 -07:00 committed by Ethan Lee
parent 6b317c5ab9
commit 5661f46a52
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop_version/src/Game.cpp
View file

@ -2011,17 +2011,17 @@ void Game::updatestate()
graphics.addline("You have found a lost crewmate!"); graphics.addline("You have found a lost crewmate!");
graphics.textboxcenterx(); graphics.textboxcenterx();
if(int(ed.numcrewmates-crewmates())==0) if(ed.numcrewmates-crewmates()==0)
{ {
graphics.createtextbox(" All crewmates rescued! ", 50, 65, 174, 174, 174); graphics.createtextbox(" All crewmates rescued! ", 50, 65, 174, 174, 174);
} }
else if(ed.numcrewmates-crewmates()==1) else if(ed.numcrewmates-crewmates()==1)
{ {
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remains ", 50, 65, 174, 174, 174); graphics.createtextbox(" " + help.number(ed.numcrewmates-crewmates())+ " remains ", 50, 65, 174, 174, 174);
} }
else else
{ {
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remain ", 50, 65, 174, 174, 174); graphics.createtextbox(" " + help.number(ed.numcrewmates-crewmates())+ " remain ", 50, 65, 174, 174, 174);
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
@ -2033,17 +2033,17 @@ void Game::updatestate()
graphics.addline("You have found a lost crewmate!"); graphics.addline("You have found a lost crewmate!");
graphics.textboxcenterx(); graphics.textboxcenterx();
if(int(ed.numcrewmates-crewmates())==0) if(ed.numcrewmates-crewmates()==0)
{ {
graphics.createtextbox(" All crewmates rescued! ", 50, 135, 174, 174, 174); graphics.createtextbox(" All crewmates rescued! ", 50, 135, 174, 174, 174);
} }
else if(ed.numcrewmates-crewmates()==1) else if(ed.numcrewmates-crewmates()==1)
{ {
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remains ", 50, 135, 174, 174, 174); graphics.createtextbox(" " + help.number(ed.numcrewmates-crewmates())+ " remains ", 50, 135, 174, 174, 174);
} }
else else
{ {
graphics.createtextbox(" " + help.number(int(ed.numcrewmates-crewmates()))+ " remain ", 50, 135, 174, 174, 174); graphics.createtextbox(" " + help.number(ed.numcrewmates-crewmates())+ " remain ", 50, 135, 174, 174, 174);
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
} }

8
desktop_version/src/Render.cpp
View file

@ -2139,9 +2139,9 @@ void maprender()
graphics.Print( -1, 220-120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true); graphics.Print( -1, 220-120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true);
if(ed.numcrewmates-game.crewmates()==1){ if(ed.numcrewmates-game.crewmates()==1){
graphics.Print(1,220-165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmate remains", 196, 196, 255 - help.glow, true); graphics.Print(1,220-165, help.number(ed.numcrewmates-game.crewmates())+ " crewmate remains", 196, 196, 255 - help.glow, true);
}else if(ed.numcrewmates-game.crewmates()>0){ }else if(ed.numcrewmates-game.crewmates()>0){
graphics.Print(1,220-165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmates remain", 196, 196, 255 - help.glow, true); graphics.Print(1,220-165, help.number(ed.numcrewmates-game.crewmates())+ " crewmates remain", 196, 196, 255 - help.glow, true);
} }
} }
else else
@ -2154,9 +2154,9 @@ void maprender()
graphics.Print( -1, 120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true); graphics.Print( -1, 120, ed.ListOfMetaData[game.playcustomlevel].Desc3, 196, 196, 255 - help.glow, true);
if(ed.numcrewmates-game.crewmates()==1){ if(ed.numcrewmates-game.crewmates()==1){
graphics.Print(1,165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmate remains", 196, 196, 255 - help.glow, true); graphics.Print(1,165, help.number(ed.numcrewmates-game.crewmates())+ " crewmate remains", 196, 196, 255 - help.glow, true);
}else if(ed.numcrewmates-game.crewmates()>0){ }else if(ed.numcrewmates-game.crewmates()>0){
graphics.Print(1,165, help.number(int(ed.numcrewmates-game.crewmates()))+ " crewmates remain", 196, 196, 255 - help.glow, true); graphics.Print(1,165, help.number(ed.numcrewmates-game.crewmates())+ " crewmates remain", 196, 196, 255 - help.glow, true);
} }
} }
} }