From e82fde83c93e83c5303949869fb83eb771cd36cb Mon Sep 17 00:00:00 2001 From: Klemen Plestenjak Date: Wed, 10 Jan 2024 21:37:11 +0100 Subject: [PATCH] Fix screen switching --- game/game_state.h | 4 ++++ game/main.c | 5 ----- game/systems/s_input.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/game/game_state.h b/game/game_state.h index 8f74a36..031e1af 100644 --- a/game/game_state.h +++ b/game/game_state.h @@ -83,6 +83,10 @@ typedef struct Game { DrawData *drawData; } Game; +static void setScreen(Game *game, GameScreen newScreen) { + game->nextScreen = newScreen; +} + extern ecs_world_t *ECS; extern ECS_COMPONENT_DECLARE(Game); // defined in main.c diff --git a/game/main.c b/game/main.c index 16afadc..c498dd1 100644 --- a/game/main.c +++ b/game/main.c @@ -162,11 +162,6 @@ bool deserializeOptions(const char *path, Options *optsOut) { return false; } - -void setScreen(Game *game, GameScreen newScreen) { - game->nextScreen = newScreen; -} - bool init(void *userData) { // Center window int monitor = GetCurrentMonitor(); diff --git a/game/systems/s_input.c b/game/systems/s_input.c index 5783726..c167f35 100644 --- a/game/systems/s_input.c +++ b/game/systems/s_input.c @@ -176,7 +176,7 @@ void updatePlayerInput() { if (IsKeyReleased(input->mapping.backBtn)) { i32 selectedCount = ecs_query_entity_count(input->queries.selected); if (selectedCount == 0) { - game->screen = SCREEN_PAUSE_MENU; + setScreen(game, SCREEN_PAUSE_MENU); } else { ecs_remove_all(ECS, Selected); resetInputState(input);