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

remove two-argument setstate

Browse source
This commit is contained in:
AllyTally 2022-12-07 21:10:12 -04:00 committed by Misa Elizabeth Kai
parent af3e5be09b
commit f659eca818
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
desktop_version/src/Game.cpp
View file

@ -724,15 +724,6 @@ void Game::setstate(const int gamestate)
} }
} }
void Game::setstate(const int gamestate, const int delay)
{
if (!statelocked)
{
state = gamestate;
statedelay = delay;
}
}
void Game::incstate() void Game::incstate()
{ {
if (!statelocked) if (!statelocked)
@ -1072,7 +1063,8 @@ void Game::updatestate(void)
break; break;
case 31: case 31:
//state = 55; setstatedelay(50); //state = 55; setstatedelay(50);
setstate(0, 0); setstate(0);
setstatedelay(0);
if (!obj.flags[6]) if (!obj.flags[6])
{ {
obj.flags[6] = true; obj.flags[6] = true;
@ -1080,7 +1072,8 @@ void Game::updatestate(void)
obj.flags[5] = true; obj.flags[5] = true;
startscript = true; startscript = true;
newscript="communicationstation"; newscript="communicationstation";
setstate(0, 0); setstate(0);
setstatedelay(0);
} }
obj.removetrigger(31); obj.removetrigger(31);
break; break;
@ -2308,7 +2301,8 @@ void Game::updatestate(void)
} }
break; break;
case 3011: case 3011:
setstate(3070, 0); setstate(3070);
setstatedelay(0);
break; break;
case 3020: case 3020:
@ -2349,7 +2343,8 @@ void Game::updatestate(void)
} }
break; break;
case 3025: case 3025:
setstate(3070, 0); setstate(3070);
setstatedelay(0);
break; break;
case 3040: case 3040:
@ -2389,7 +2384,8 @@ void Game::updatestate(void)
} }
break; break;
case 3045: case 3045:
setstate(3070, 0); setstate(3070);
setstatedelay(0);
break; break;
case 3050: case 3050:
@ -2496,7 +2492,8 @@ void Game::updatestate(void)
} }
break; break;
case 3065: case 3065:
setstate(3070, 0); setstate(3070);
setstatedelay(0);
break; break;
@ -2790,7 +2787,8 @@ void Game::updatestate(void)
{ {
unlockAchievement("vvvvvvmaster"); //bloody hell unlockAchievement("vvvvvvmaster"); //bloody hell
unlocknum(20); unlocknum(20);
setstate(3520, 0); setstate(3520);
setstatedelay(0);
} }
else else
{ {
@ -2943,7 +2941,7 @@ void Game::updatestate(void)
break; break;
} }
case 4003: case 4003:
state++; state = 0;
statedelay = 0; statedelay = 0;
teleport_to_new_area = true; teleport_to_new_area = true;
unlockstate(); unlockstate();

2
desktop_version/src/Game.h
View file

@ -161,8 +161,6 @@ public:
void setstate(int gamestate); void setstate(int gamestate);
void setstate(int gamestate, int delay);
void incstate(); void incstate();
void setstatedelay(int delay); void setstatedelay(int delay);

3
desktop_version/src/Input.cpp
View file

@ -2632,7 +2632,8 @@ static void mapmenuactionpress(const bool version2_2)
} }
//which teleporter script do we use? it depends on the companion! //which teleporter script do we use? it depends on the companion!
game.setstate(4000, 0); game.setstate(4000);
game.setstatedelay(0);
game.lockstate(); game.lockstate();
} }
break; break;