mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Move return to lab code to Game::returntolab()
Again, I'll keep gamestate 96 and 97 for compatibility reasons, but ultimately we shouldn't be using gamestates to return to the lab.
This commit is contained in:
parent
b59e5a8346
commit
69aeac2410
2 changed files with 10 additions and 4 deletions
|
@ -1461,10 +1461,7 @@ void Game::updatestate()
|
|||
if(graphics.fademode == 1) state++;
|
||||
break;
|
||||
case 97:
|
||||
gamestate = GAMEMODE;
|
||||
graphics.fademode = 4;
|
||||
startscript = true;
|
||||
newscript="returntolab";
|
||||
returntolab();
|
||||
state = 0;
|
||||
break;
|
||||
|
||||
|
@ -7354,3 +7351,11 @@ void Game::quittomenu()
|
|||
}
|
||||
script.hardreset();
|
||||
}
|
||||
|
||||
void Game::returntolab()
|
||||
{
|
||||
gamestate = GAMEMODE;
|
||||
graphics.fademode = 4;
|
||||
startscript = true;
|
||||
newscript="returntolab";
|
||||
}
|
||||
|
|
|
@ -380,6 +380,7 @@ public:
|
|||
int playgc;
|
||||
|
||||
void quittomenu();
|
||||
void returntolab();
|
||||
};
|
||||
|
||||
extern Game game;
|
||||
|
|
Loading…
Reference in a new issue