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

Move mapinput() ACTION press handling to separate function

Browse source 
It's a bit too much to consolidate all the ACTION press handling into
one function, especially given the increasing amount of indentation
levels.
This commit is contained in:
Misa 2020-06-22 15:30:10 -07:00 committed by Ethan Lee
parent 92154f4be1
commit 55d001b4f6
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
desktop_version/src/Input.cpp
View file

@ -1859,6 +1859,8 @@ void gameinput()
} }
} }
void mapmenuactionpress();
void mapinput() void mapinput()
{ {
//TODO Mouse Input! //TODO Mouse Input!
@ -1973,6 +1975,24 @@ void mapinput()
game.menupage++; game.menupage++;
} }
mapmenuactionpress();
if (game.menupage < 0) game.menupage = 3;
if (game.menupage > 3 && game.menupage < 9) game.menupage = 0;
if (game.menupage == 9) game.menupage = 11;
if (game.menupage == 12) game.menupage = 10;
if (game.menupage == 19) game.menupage = 21;
if (game.menupage == 22) game.menupage = 20;
if (game.menupage == 29) game.menupage = 33;
if (game.menupage == 34) game.menupage = 30;
}
}
void mapmenuactionpress()
{
if (game.menupage == 1 && obj.flags[67] && game.press_action && !game.insecretlab && !map.custommode) if (game.menupage == 1 && obj.flags[67] && game.press_action && !game.insecretlab && !map.custommode)
{ {
//Warp back to the ship //Warp back to the ship
@ -2056,19 +2076,6 @@ void mapinput()
game.fadetolab = true; game.fadetolab = true;
game.fadetolabdelay = 16; game.fadetolabdelay = 16;
} }
if (game.menupage < 0) game.menupage = 3;
if (game.menupage > 3 && game.menupage < 9) game.menupage = 0;
if (game.menupage == 9) game.menupage = 11;
if (game.menupage == 12) game.menupage = 10;
if (game.menupage == 19) game.menupage = 21;
if (game.menupage == 22) game.menupage = 20;
if (game.menupage == 29) game.menupage = 33;
if (game.menupage == 34) game.menupage = 30;
}
} }
void teleporterinput() void teleporterinput()