small fix to prevent compilation warning for SDL1 target

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index c01a99d711a640b175858a7e03dce7e8de5eb9cd..ec7d7b66cc928ace7caf6f292c6e3b4ffb4ebb7d 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -235,9 +235,6 @@ static TreeInfo *drop_distance_current = NULL;
 static TreeInfo *level_number = NULL;
 static TreeInfo *level_number_current = NULL;
 
-static unsigned int sync_frame_delay = 0;
-static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
-
 static struct
 {
   int value;
@@ -1400,6 +1397,8 @@ void DrawMainMenu()
   UnmapAllGadgets();
   FadeSoundsAndMusic();
 
+  ExpireSoundLoops(FALSE);
+
   KeyboardAutoRepeatOn();
   ActivateJoystick();
 
@@ -1664,9 +1663,9 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       sound = getTitleSound(tci);
       music = getTitleMusic(tci);
 
-      if (sound == SND_UNDEFINED || sound != last_sound)
-       FadeSounds();
-      if (music == MUS_UNDEFINED || music != last_music)
+      if (last_sound != SND_UNDEFINED && sound != last_sound)
+       FadeSound(last_sound);
+      if (last_music != MUS_UNDEFINED && music != last_music)
        FadeMusic();
 
       fading = getTitleFading(tci);
@@ -2168,6 +2167,7 @@ static void DrawInfoScreen_Main()
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
+  FadeSoundsAndMusic();
 
   FreeScreenGadgets();
   CreateScreenGadgets();
@@ -4073,6 +4073,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 void DrawChooseLevelSet()
 {
+  FadeSoundsAndMusic();
+
   SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
 
   DrawChooseTree(&leveldir_current);
@@ -4090,6 +4092,8 @@ void DrawChooseLevelNr()
 {
   int i;
 
+  FadeSoundsAndMusic();
+
   if (level_number != NULL)
   {
     freeTreeInfo(level_number);
@@ -4703,16 +4707,14 @@ static void execSetupGraphics_setRenderingModes()
 
 static void execSetupGraphics()
 {
+  // update "setup.window_scaling_percent" from list selection
+  // (in this case, window scaling was changed on setup screen)
   if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
-  {
-    // update "setup.window_scaling_percent" from list selection
     execSetupGraphics_setWindowSizes(FALSE);
-  }
-  else
-  {
-    // update list selection from "setup.window_scaling_percent"
-    execSetupGraphics_setWindowSizes(TRUE);
-  }
+
+  // update list selection from "setup.window_scaling_percent"
+  // (window scaling may have changed by resizing the window)
+  execSetupGraphics_setWindowSizes(TRUE);
 
   execSetupGraphics_setScalingTypes();
   execSetupGraphics_setRenderingModes();
@@ -5588,8 +5590,6 @@ static Key getSetupKey()
 
     DoAnimation();
     BackToFront();
-
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   return key;
@@ -5634,7 +5634,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
   int ypos = MENU_SCREEN_START_YPOS + screen_pos;
   int startx = mSX + xpos * 32;
   int starty = mSY + ypos * 32;
-  int font_nr, font_width;
+  int font_nr, font_nr_default, font_width_default;
   int type = si->type;
   void *value = si->value;
   char *value_string = getSetupValue(type, value);
@@ -5666,8 +5666,10 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
 
   startx = mSX + xpos * 32;
   starty = mSY + ypos * 32;
-  font_nr = getSetupValueFont(type, value);
-  font_width = getFontWidth(font_nr);
+  font_nr_default = getSetupValueFont(type, value);
+  font_width_default = getFontWidth(font_nr_default);
+
+  font_nr = font_nr_default;
 
   // special check if right-side setup values moved left due to scrollbar
   if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
@@ -5685,7 +5687,6 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
       startx = mSX + xpos * 32;
 
       font_nr = getSetupValueFontNarrow(type, font_nr);
-      font_width = getFontWidth(font_nr);
     }
   }
 
@@ -5728,7 +5729,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
   }
 
   for (i = 0; i <= menu_screen_max_xpos - xpos; i++)
-    DrawText(startx + i * font_width, starty, " ", font_nr);
+    DrawText(startx + i * font_width_default, starty, " ", font_nr_default);
 
   DrawText(startx, starty, value_string, font_nr);
 
@@ -5785,6 +5786,7 @@ static void DrawSetupScreen_Generic()
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
+  FadeSoundsAndMusic();
 
   FreeScreenGadgets();
   CreateScreenGadgets();
@@ -6302,8 +6304,6 @@ void CustomizeKeyboard(int player_nr)
 
     DoAnimation();
     BackToFront();
-
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   /* write new key bindings back to player setup */
@@ -6457,8 +6457,6 @@ static boolean CalibrateJoystickMain(int player_nr)
 
     DoAnimation();
     BackToFront();
-
-    WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
   }
 
   /* calibrated center position (joystick should now be centered) */
@@ -6480,7 +6478,7 @@ static boolean CalibrateJoystickMain(int player_nr)
       NextEvent(&event);
       HandleOtherEvents(&event);
 
-      WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
+      BackToFront();
     }
   }