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

Move temp int off of Game

Browse source 
This temp variable isn't used anywhere else, and even if it was it's set
to something every time it's used, so there's no risk of this commit
breaking any backwards compatibility.
This commit is contained in:
Misa 2020-04-16 16:08:56 -07:00 committed by Ethan Lee
parent 56a168eed6
commit 503b3f1692
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
desktop_version/src/Game.cpp
View file

@ -2355,10 +2355,11 @@ void Game::updatestate()
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
case 3008: case 3008:
{
state++; state++;
statedelay = 45; statedelay = 45;
temp = 6 - crewrescued(); int temp = 6 - crewrescued();
if (temp == 1) if (temp == 1)
{ {
std::string tempstring = " One remains "; std::string tempstring = " One remains ";
@ -2396,6 +2397,7 @@ void Game::updatestate()
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
}
case 3009: case 3009:
state++; state++;
statedelay = 0; statedelay = 0;
@ -2470,10 +2472,11 @@ void Game::updatestate()
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
case 3022: case 3022:
{
state++; state++;
statedelay = 45; statedelay = 45;
temp = 6 - crewrescued(); int temp = 6 - crewrescued();
if (temp == 1) if (temp == 1)
{ {
std::string tempstring = " One remains "; std::string tempstring = " One remains ";
@ -2511,6 +2514,7 @@ void Game::updatestate()
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
}
case 3023: case 3023:
state++; state++;
statedelay = 0; statedelay = 0;
@ -2584,10 +2588,11 @@ void Game::updatestate()
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
case 3042: case 3042:
{
state++; state++;
statedelay = 45; statedelay = 45;
temp = 6 - crewrescued(); int temp = 6 - crewrescued();
if (temp == 1) if (temp == 1)
{ {
std::string tempstring = " One remains "; std::string tempstring = " One remains ";
@ -2625,6 +2630,7 @@ void Game::updatestate()
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
}
case 3043: case 3043:
state++; state++;
statedelay = 0; statedelay = 0;
@ -2699,10 +2705,11 @@ void Game::updatestate()
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
case 3052: case 3052:
{
state++; state++;
statedelay = 45; statedelay = 45;
temp = 6 - crewrescued(); int temp = 6 - crewrescued();
if (temp == 1) if (temp == 1)
{ {
std::string tempstring = " One remains "; std::string tempstring = " One remains ";
@ -2740,6 +2747,7 @@ void Game::updatestate()
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
}
case 3053: case 3053:
state++; state++;
statedelay = 0; statedelay = 0;
@ -2832,10 +2840,11 @@ void Game::updatestate()
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
case 3062: case 3062:
{
state++; state++;
statedelay = 45; statedelay = 45;
temp = 6 - crewrescued(); int temp = 6 - crewrescued();
if (temp == 1) if (temp == 1)
{ {
std::string tempstring = " One remains "; std::string tempstring = " One remains ";
@ -2873,6 +2882,7 @@ void Game::updatestate()
} }
graphics.textboxcenterx(); graphics.textboxcenterx();
break; break;
}
case 3063: case 3063:
state++; state++;
statedelay = 0; statedelay = 0;
@ -6815,9 +6825,10 @@ void Game::createmenu( enum Menu::MenuName t )
menuyoff = 64; menuyoff = 64;
break; break;
case Menu::play: case Menu::play:
{
//Ok, here's where the unlock stuff comes into it: //Ok, here's where the unlock stuff comes into it:
//First up, time trials: //First up, time trials:
temp = 0; int temp = 0;
if (unlock[0] && stat_trinkets >= 3 && !unlocknotify[9]) temp++; if (unlock[0] && stat_trinkets >= 3 && !unlocknotify[9]) temp++;
if (unlock[1] && stat_trinkets >= 6 && !unlocknotify[10]) temp++; if (unlock[1] && stat_trinkets >= 6 && !unlocknotify[10]) temp++;
if (unlock[2] && stat_trinkets >= 9 && !unlocknotify[11]) temp++; if (unlock[2] && stat_trinkets >= 9 && !unlocknotify[11]) temp++;
@ -6927,6 +6938,7 @@ void Game::createmenu( enum Menu::MenuName t )
} }
} }
break; break;
}
case Menu::unlocktimetrial: case Menu::unlocktimetrial:
case Menu::unlocktimetrials: case Menu::unlocktimetrials:
case Menu::unlocknodeathmode: case Menu::unlocknodeathmode:

2
desktop_version/src/Game.h
View file

@ -161,7 +161,7 @@ public:
int door_down; int door_down;
int roomx, roomy, roomchangedir; int roomx, roomy, roomchangedir;
int prevroomx, prevroomy; int prevroomx, prevroomy;
int temp, j, k; int j, k;
int savex, savey, saverx, savery; int savex, savey, saverx, savery;
int savegc, savedir; int savegc, savedir;