walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Maint: Cleaned up a complex function

This commit is contained in:
Linus Probert 2018-09-13 11:35:07 +02:00
parent e293c21908
commit 983875d064
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main.c
View File

@ -562,27 +562,8 @@ toggle_fullscreen(void)
} }
static void static void
handle_main_input(void) handle_settings_input(void)
{ {
if (gGameState == PLAYING
|| gGameState == IN_GAME_MENU
|| gGameState == GAME_OVER
|| gGameState == COMPLETED)
{
if (!gGui->activeTooltip && input_key_is_pressed(&input, KEY_ESC))
toggleInGameMenu(NULL);
}
if (gGameState == CREDITS && input_key_is_pressed(&input, KEY_ESC))
gGameState = MENU;
else if ((gGameState == SCORE_SCREEN || gGameState == CHARACTER_MENU)
&& input_key_is_pressed(&input, KEY_ESC))
gGameState = MENU;
else if (gGameState == MENU && input_key_is_pressed(&input, KEY_ESC))
gGameState = QUIT;
else if (gGui->activeTooltip && input_key_is_pressed(&input, KEY_ESC))
gGui->activeTooltip = NULL;
if (input_modkey_is_pressed(&input, KEY_CTRL_M)) { if (input_modkey_is_pressed(&input, KEY_CTRL_M)) {
if (mixer_toggle_music(&gGameState)) if (mixer_toggle_music(&gGameState))
gui_log("Music enabled"); gui_log("Music enabled");
@ -611,6 +592,36 @@ handle_main_input(void)
} }
} }
static void
handle_main_input(void)
{
if (input_key_is_pressed(&input, KEY_ESC)) {
switch (gGameState) {
case CREDITS:
case SCORE_SCREEN:
case CHARACTER_MENU:
gGameState = MENU;
break;
case MENU:
gGameState = QUIT;
break;
case PLAYING:
case IN_GAME_MENU:
case GAME_OVER:
case COMPLETED:
if (gGui->activeTooltip)
gGui->activeTooltip = NULL;
else
toggleInGameMenu(NULL);
default:
break;
}
}
handle_settings_input();
}
static bool static bool
handle_events(void) handle_events(void)
{ {