From: Holger Schemel <info@artsoft.org>
Date: Wed, 27 Sep 2017 20:11:58 +0000 (+0200)
Subject: fixed compiler warning by adding missing variable initialization (finally)
X-Git-Tag: 4.0.1.0~5
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=f6d6f94c5738467ae3f3ba639f01244581d8ea1f

fixed compiler warning by adding missing variable initialization (finally)
---

diff --git a/src/screens.c b/src/screens.c
index 0a63c2e4..a5bc5ac1 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -6522,7 +6522,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   static boolean bitmaps_initialized = FALSE;
   boolean screen_initialized = FALSE;
   static Bitmap *controller, *button, *axis_x, *axis_y;
-  Bitmap *marker;
   char *name;
   boolean success = TRUE;
   boolean done = FALSE, next = FALSE;
@@ -6581,8 +6580,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
     axis_x     = LoadCustomImage("joystick/axis_x.png");
     axis_y     = LoadCustomImage("joystick/axis_y.png");
 
-    marker = button;	/* initialize with reliable default value */
-
     bitmaps_initialized = TRUE;
   }
 
@@ -6604,6 +6601,8 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   /* loop through all steps (buttons and axes), getting joystick events */
   for (i = 0; i < SDL_arraysize(steps) && !done;)
   {
+    Bitmap *marker = button;	/* initialize with reliable default value */
+
     step = &steps[i];
     strcpy(step->mapping, mapping);
     step->axis = -1;