Refactor/make game vars extern (#451)

* Remove GameVariables pointer for callbacks

* Make game_vars a global

* move declaration of game vars in header

* Move g_game_vars location
This commit is contained in:
Rickey
2026-04-27 19:55:07 -07:00
committed by GitHub
parent d3df6a4d74
commit adca0961f5
5 changed files with 47 additions and 46 deletions
+1 -1
View File
@@ -121,7 +121,7 @@ typedef struct ContainedHandTypes
} ContainedHandTypes;
// clang-format on
typedef void (*GameStateCallback)(GameVariables* gs);
typedef void (*GameStateCallback)();
typedef struct
{
+2
View File
@@ -17,4 +17,6 @@ typedef struct
} GameVariables;
extern GameVariables g_game_vars;
#endif // GAME_VARIABLES_H
+3 -5
View File
@@ -7,8 +7,6 @@
#ifndef SPLASH_SCREEN_H
#define SPLASH_SCREEN_H
#include "game.h"
#include <tonc.h>
/** @name Splash screen timing variables
@@ -25,16 +23,16 @@
/**
* @brief Initialize the splash screen by printing the splash screen text.
*/
void splash_screen_on_init(GameVariables* vars);
void splash_screen_on_init(void);
/**
* @brief Update splash screen timers and print the remaining time accordingly.
*/
void splash_screen_on_update(GameVariables* vars);
void splash_screen_on_update(void);
/**
* @brief Exit the splash screen
*/
void splash_screen_on_exit(GameVariables* vars);
void splash_screen_on_exit(void);
#endif // SPLASH_SCREEN_H