From 0531ee9b197ee8c71954c7c903d9d6c2310ec6b9 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Wed, 19 Feb 2020 12:44:36 -0500 Subject: [PATCH] SDL_Init after FILESYSTEM_init, for gamecontrollerdb.txt --- desktop_version/src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index be4547c6..6f14e5d9 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -46,13 +46,6 @@ entityclass obj; int main(int argc, char *argv[]) { - SDL_Init( - SDL_INIT_VIDEO | - SDL_INIT_AUDIO | - SDL_INIT_JOYSTICK | - SDL_INIT_GAMECONTROLLER - ); - char* baseDir = NULL; char* assetsPath = NULL; @@ -74,6 +67,13 @@ int main(int argc, char *argv[]) return 1; } + SDL_Init( + SDL_INIT_VIDEO | + SDL_INIT_AUDIO | + SDL_INIT_JOYSTICK | + SDL_INIT_GAMECONTROLLER + ); + NETWORK_init(); Screen gameScreen;