Fix attempt to use "joystick" option before config system is set up

git-svn-id: https://s.snth.net/svn/neverball/trunk@3045 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/main.c b/ball/main.c
index e097352..59d8047 100644 (file)
--- a/ball/main.c
+++ b/ball/main.c
@@ -380,7 +380,6 @@ int main(int argc, char *argv[])
 {
     SDL_Joystick *joy = NULL;
     int t1, t0, uniform;
-    Uint32 flags = 0;
 
     if (!fs_init(argv[0]))
     {
@@ -397,11 +396,7 @@ int main(int argc, char *argv[])
 
     /* Initialize SDL system and subsystems */
 
-    flags |= SDL_INIT_VIDEO;
-    flags |= SDL_INIT_AUDIO;
-    flags |= config_get_d(CONFIG_JOYSTICK) ? SDL_INIT_JOYSTICK : 0;
-
-    if (SDL_Init(flags) == -1)
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) == -1)
     {
         fprintf(stderr, "%s\n", SDL_GetError());
         return 1;
@@ -414,7 +409,7 @@ int main(int argc, char *argv[])
 
     /* Initialize the joystick. */
 
-    if (SDL_WasInit(SDL_INIT_JOYSTICK) && SDL_NumJoysticks() > 0)
+    if (config_get_d(CONFIG_JOYSTICK) && SDL_NumJoysticks() > 0)
     {
         joy = SDL_JoystickOpen(config_get_d(CONFIG_JOYSTICK_DEVICE));
         if (joy)

diff --git a/putt/main.c b/putt/main.c
index 2d90160..d5d5635 100644 (file)
--- a/putt/main.c
+++ b/putt/main.c
@@ -193,7 +193,6 @@ int main(int argc, char *argv[])
 {
     int camera = 0;
     SDL_Joystick *joy = NULL;
-    Uint32 flags = 0;
 
     if (!fs_init(argv[0]))
     {
@@ -207,11 +206,7 @@ int main(int argc, char *argv[])
     config_paths(argc > 1 ? argv[1] : NULL);
     fs_mkdir("Screenshots");
 
-    flags |= SDL_INIT_VIDEO;
-    flags |= SDL_INIT_AUDIO;
-    flags |= config_get_d(CONFIG_JOYSTICK) ? SDL_INIT_JOYSTICK : 0;
-
-    if (SDL_Init(flags) == 0)
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) == 0)
     {
         config_init();
         config_load();
@@ -222,7 +217,7 @@ int main(int argc, char *argv[])
 
         /* Initialize the joystick. */
 
-        if (SDL_WasInit(SDL_INIT_JOYSTICK) && SDL_NumJoysticks() > 0)
+        if (config_get_d(CONFIG_JOYSTICK) && SDL_NumJoysticks() > 0)
         {
             joy = SDL_JoystickOpen(config_get_d(CONFIG_JOYSTICK_DEVICE));
             if (joy)