rocksndiamonds-2.0.1

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 486ad6d9415040f7627f8f6bd075ec3d140cbd1c..2984e5dad87e829b703817fee38e6e5b79dcd9f1 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment                      *
+* (c) 1995-2001 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -71,7 +71,8 @@ static void ToggleFullscreenIfNeeded()
               DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
     /* toggle fullscreen */
-    setup.fullscreen = ChangeVideoModeIfNeeded(setup.fullscreen);
+    ChangeVideoModeIfNeeded(setup.fullscreen);
+    setup.fullscreen = video.fullscreen_enabled;
 
     /* redraw background to newly created backbuffer */
     BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
@@ -700,7 +701,9 @@ void DrawHelpScreenMusicText(int num)
 
   DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
 
+#if 0
   PlaySoundLoop(background_loop[num]);
+#endif
 }
 
 void DrawHelpScreenCreditsText()
@@ -1169,15 +1172,19 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
        node_cursor->cl_first = leveldir_current->cl_first;
        node_cursor->cl_cursor = leveldir_current->cl_cursor;
        leveldir_current = node_cursor->node_group;
+
        DrawChooseLevel();
       }
       else if (node_cursor->parent_link)
       {
        leveldir_current = node_cursor->node_parent;
+
        DrawChooseLevel();
       }
       else
       {
+       node_cursor->cl_first = leveldir_current->cl_first;
+       node_cursor->cl_cursor = leveldir_current->cl_cursor;
        leveldir_current = node_cursor;
 
        LoadLevelSetup_SeriesInfo();
@@ -1201,6 +1208,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 void DrawHallOfFame(int highlight_position)
 {
   UnmapAllGadgets();
+  FadeSounds();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0)