mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Change gamestate ints to their enum names
This is to make it easier to read, so I don't have to reference Enums.h if I want to know what they are referring to.
This commit is contained in:
parent
637a9d5665
commit
4d9c834a13
5 changed files with 11 additions and 11 deletions
|
@ -1332,7 +1332,7 @@ void Game::updatestate()
|
|||
if(graphics.fademode == 1) state++;
|
||||
break;
|
||||
case 81:
|
||||
gamestate = 1;
|
||||
gamestate = TITLEMODE;
|
||||
graphics.fademode = 4;
|
||||
music.play(6);
|
||||
graphics.backgrounddrawn = false;
|
||||
|
@ -1389,7 +1389,7 @@ void Game::updatestate()
|
|||
break;
|
||||
case 84:
|
||||
graphics.flipmode = false;
|
||||
gamestate = 1;
|
||||
gamestate = TITLEMODE;
|
||||
graphics.fademode = 4;
|
||||
graphics.backgrounddrawn = true;
|
||||
map.tdrawback = true;
|
||||
|
@ -1469,7 +1469,7 @@ void Game::updatestate()
|
|||
if(graphics.fademode == 1) state++;
|
||||
break;
|
||||
case 97:
|
||||
gamestate = 0;
|
||||
gamestate = GAMEMODE;
|
||||
graphics.fademode = 4;
|
||||
startscript = true;
|
||||
newscript="returntolab";
|
||||
|
@ -3049,7 +3049,7 @@ void Game::updatestate()
|
|||
break;
|
||||
case 3101:
|
||||
graphics.flipmode = false;
|
||||
gamestate = 1;
|
||||
gamestate = TITLEMODE;
|
||||
graphics.fademode = 4;
|
||||
graphics.backgrounddrawn = true;
|
||||
map.tdrawback = true;
|
||||
|
@ -3376,7 +3376,7 @@ void Game::updatestate()
|
|||
break;
|
||||
case 3522:
|
||||
graphics.flipmode = false;
|
||||
gamestate = 1;
|
||||
gamestate = TITLEMODE;
|
||||
graphics.fademode = 4;
|
||||
graphics.backgrounddrawn = true;
|
||||
map.tdrawback = true;
|
||||
|
|
|
@ -1484,7 +1484,7 @@ void gameinput()
|
|||
else if (game.companion == 0)
|
||||
{
|
||||
//Alright, normal teleporting
|
||||
game.gamestate = 5;
|
||||
game.gamestate = TELEPORTERMODE;
|
||||
graphics.menuoffset = 240; //actually this should count the roomname
|
||||
if (map.extrarow) graphics.menuoffset -= 10;
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ void gamecompletelogic()
|
|||
graphics.showcutscenebars = false;
|
||||
graphics.cutscenebarspos = 0;
|
||||
//Return to game
|
||||
game.gamestate = 7;
|
||||
game.gamestate = GAMECOMPLETE2;
|
||||
graphics.fademode = 4;
|
||||
}
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ void gamecompletelogic2()
|
|||
music.currentsong=tmp;
|
||||
//Return to game
|
||||
map.colstate = 10;
|
||||
game.gamestate = 1;
|
||||
game.gamestate = TITLEMODE;
|
||||
graphics.fademode = 4;
|
||||
music.playef(18);
|
||||
game.createmenu(Menu::gamecompletecontinue);
|
||||
|
|
|
@ -1266,7 +1266,7 @@ void scriptclass::run()
|
|||
if (words[1] == "teleporter")
|
||||
{
|
||||
//TODO this draw the teleporter screen. This is a problem. :(
|
||||
game.gamestate = 5;
|
||||
game.gamestate = TELEPORTERMODE;
|
||||
graphics.menuoffset = 240; //actually this should count the roomname
|
||||
if (map.extrarow) graphics.menuoffset -= 10;
|
||||
|
||||
|
@ -1502,7 +1502,7 @@ void scriptclass::run()
|
|||
}
|
||||
else if (words[0] == "rollcredits")
|
||||
{
|
||||
game.gamestate = 6;
|
||||
game.gamestate = GAMECOMPLETE;
|
||||
graphics.fademode = 4;
|
||||
game.creditposition = 0;
|
||||
}
|
||||
|
|
|
@ -3448,7 +3448,7 @@ void editorlogic()
|
|||
//Return to game
|
||||
map.nexttowercolour();
|
||||
map.colstate = 10;
|
||||
game.gamestate = 1;
|
||||
game.gamestate = TITLEMODE;
|
||||
graphics.fademode = 4;
|
||||
music.haltdasmusik();
|
||||
music.play(6);
|
||||
|
|
Loading…
Reference in a new issue