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

Move return to lab code to Game::returntolab()

Browse source 
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:
Misa 2020-05-07 15:17:04 -07:00 committed by Ethan Lee
parent b59e5a8346
commit 69aeac2410
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
desktop_version/src/Game.cpp
View file

@ -1461,10 +1461,7 @@ void Game::updatestate()
if(graphics.fademode == 1) state++; if(graphics.fademode == 1) state++;
break; break;
case 97: case 97:
gamestate = GAMEMODE; returntolab();
graphics.fademode = 4;
startscript = true;
newscript="returntolab";
state = 0; state = 0;
break; break;
@ -7354,3 +7351,11 @@ void Game::quittomenu()
} }
script.hardreset(); script.hardreset();
} }
void Game::returntolab()
{
gamestate = GAMEMODE;
graphics.fademode = 4;
startscript = true;
newscript="returntolab";
}

1
desktop_version/src/Game.h
View file

@ -380,6 +380,7 @@ public:
int playgc; int playgc;
void quittomenu(); void quittomenu();
void returntolab();
}; };
extern Game game; extern Game game;