eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup game.h 

See #42
This commit is contained in:
Alexander Batalov 2022-06-19 13:18:12 +03:00
parent 24176ec52b
commit f5c0c1d61f
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/game.cc
View File

@ -72,20 +72,27 @@
#define SPLASH_HEIGHT (480) #define SPLASH_HEIGHT (480)
#define SPLASH_COUNT (10) #define SPLASH_COUNT (10)
static int gameLoadGlobalVars();
static int gameTakeScreenshot(int width, int height, unsigned char* buffer, unsigned char* palette);
static void gameFreeGlobalVars();
static void showHelp();
static int gameDbInit();
static void showSplash();
// 0x501C9C // 0x501C9C
char _aGame_0[] = "game\\"; static char _aGame_0[] = "game\\";
// 0x5020B8 // 0x5020B8
char _aDec11199816543[] = VERSION_BUILD_TIME; static char _aDec11199816543[] = VERSION_BUILD_TIME;
// 0x5186B4 // 0x5186B4
bool gGameUiDisabled = false; static bool gGameUiDisabled = false;
// 0x5186B8 // 0x5186B8
int _game_state_cur = 0; static int _game_state_cur = 0;
// 0x5186BC // 0x5186BC
bool gIsMapper = false; static bool gIsMapper = false;
// 0x5186C0 // 0x5186C0
int* gGameGlobalVars = NULL; int* gGameGlobalVars = NULL;
@ -916,7 +923,7 @@ int gameSetGlobalVar(int var, int value)
// game_load_info // game_load_info
// 0x443CC8 // 0x443CC8
int gameLoadGlobalVars() static int gameLoadGlobalVars()
{ {
return globalVarsRead("data\\vault13.gam", "GAME_GLOBAL_VARS:", &gGameGlobalVarsLength, &gGameGlobalVars); return globalVarsRead("data\\vault13.gam", "GAME_GLOBAL_VARS:", &gGameGlobalVarsLength, &gGameGlobalVars);
} }
@ -1038,7 +1045,7 @@ void _game_state_update()
} }
// 0x443EF0 // 0x443EF0
int gameTakeScreenshot(int width, int height, unsigned char* buffer, unsigned char* palette) static int gameTakeScreenshot(int width, int height, unsigned char* buffer, unsigned char* palette)
{ {
MessageListItem messageListItem; MessageListItem messageListItem;
@ -1064,7 +1071,7 @@ int gameTakeScreenshot(int width, int height, unsigned char* buffer, unsigned ch
// NOTE: Inlined. // NOTE: Inlined.
// //
// 0x443F50 // 0x443F50
void gameFreeGlobalVars() static void gameFreeGlobalVars()
{ {
gGameGlobalVarsLength = 0; gGameGlobalVarsLength = 0;
if (gGameGlobalVars != NULL) { if (gGameGlobalVars != NULL) {
@ -1074,7 +1081,7 @@ void gameFreeGlobalVars()
} }
// 0x443F74 // 0x443F74
void showHelp() static void showHelp()
{ {
bool isoWasEnabled = isoDisable(); bool isoWasEnabled = isoDisable();
gameMouseObjectsHide(); gameMouseObjectsHide();
@ -1184,7 +1191,7 @@ int showQuitConfirmationDialog()
} }
// 0x44418C // 0x44418C
int gameDbInit() static int gameDbInit()
{ {
int hashing; int hashing;
char* main_file_name; char* main_file_name;
@ -1244,7 +1251,7 @@ int gameDbInit()
} }
// 0x444384 // 0x444384
void showSplash() static void showSplash()
{ {
int splash; int splash;
configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_SPLASH_KEY, &splash); configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_SPLASH_KEY, &splash);

11
src/game.h
View File

@ -4,11 +4,6 @@
#include "game_vars.h" #include "game_vars.h"
#include "message.h" #include "message.h"
extern char _aGame_0[];
extern bool gGameUiDisabled;
extern int _game_state_cur;
extern bool gIsMapper;
extern int* gGameGlobalVars; extern int* gGameGlobalVars;
extern int gGameGlobalVarsLength; extern int gGameGlobalVarsLength;
extern const char* asc_5186C8; extern const char* asc_5186C8;
@ -27,16 +22,10 @@ void gameUiEnable();
bool gameUiIsDisabled(); bool gameUiIsDisabled();
int gameGetGlobalVar(int var); int gameGetGlobalVar(int var);
int gameSetGlobalVar(int var, int value); int gameSetGlobalVar(int var, int value);
int gameLoadGlobalVars();
int globalVarsRead(const char* path, const char* section, int* out_vars_num, int** out_vars); int globalVarsRead(const char* path, const char* section, int* out_vars_num, int** out_vars);
int _game_state(); int _game_state();
int _game_state_request(int a1); int _game_state_request(int a1);
void _game_state_update(); void _game_state_update();
int gameTakeScreenshot(int width, int height, unsigned char* buffer, unsigned char* palette);
void gameFreeGlobalVars();
void showHelp();
int showQuitConfirmationDialog(); int showQuitConfirmationDialog();
int gameDbInit();
void showSplash();
#endif /* GAME_H */ #endif /* GAME_H */