1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

cleanup: Don't savestatsandsettings if filesystem not init

This isn't necessary, but it does silence these annoying logs if you
pass an invalid argument or don't have data.zip:

    [ERROR] Could not get window size: Invalid renderer
    [WARN] Stats not loaded! Not writing unlock.vvv.
    [ERROR] Could not get window size: Invalid renderer
    [WARN] Settings not loaded! Not writing settings.vvv.

To do this, I've added FILESYSTEM_isInit().
This commit is contained in:
Misa 2022-03-14 10:45:19 -07:00
parent a168f73a67
commit 84279354e5
3 changed files with 10 additions and 1 deletions

View file

@ -186,6 +186,11 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath)
return 1; return 1;
} }
bool FILESYSTEM_isInit(void)
{
return isInit;
}
static unsigned char* stdin_buffer = NULL; static unsigned char* stdin_buffer = NULL;
static size_t stdin_length = 0; static size_t stdin_length = 0;

View file

@ -10,6 +10,7 @@ class binaryBlob;
namespace tinyxml2 { class XMLDocument; } namespace tinyxml2 { class XMLDocument; }
int FILESYSTEM_init(char *argvZero, char* baseDir, char* assetsPath); int FILESYSTEM_init(char *argvZero, char* baseDir, char* assetsPath);
bool FILESYSTEM_isInit(void);
void FILESYSTEM_deinit(void); void FILESYSTEM_deinit(void);
char *FILESYSTEM_getUserSaveDirectory(void); char *FILESYSTEM_getUserSaveDirectory(void);

View file

@ -697,7 +697,10 @@ int main(int argc, char *argv[])
static void cleanup(void) static void cleanup(void)
{ {
/* Order matters! */ /* Order matters! */
game.savestatsandsettings(); if (FILESYSTEM_isInit()) /* not necessary but silences logs */
{
game.savestatsandsettings();
}
gameScreen.destroy(); gameScreen.destroy();
graphics.grphx.destroy(); graphics.grphx.destroy();
graphics.destroy_buffers(); graphics.destroy_buffers();