X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=6a8967685317b411cd256feb9d8fba756c639555;hb=4efce7813f9315cda970e7f48be030c8c108d9f0;hp=1f64845d156cbe6a3d9b739e61f376a8ebdbb468;hpb=1a9252c7cfc77d9d616bd0a3f538cce2d24e2f74;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 1f64845d..6a896768 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3916,8 +3916,6 @@ void InitGame()
 
   /* blit playfield from scroll buffer to normal back buffer for fading in */
   BlitScreenToBitmap(backbuffer);
-
-  redraw_mask |= REDRAW_FROM_BACKBUFFER;
   /* !!! FIX THIS (END) !!! */
 
   FadeIn(REDRAW_FIELD);
@@ -4392,13 +4390,16 @@ void GameEnd()
 
   local_player->LevelSolved_GameEnd = TRUE;
 
-  CloseDoor(DOOR_CLOSE_1);
+  if (!global.use_envelope_request)
+    CloseDoor(DOOR_CLOSE_1);
 
   if (local_player->LevelSolved_SaveTape)
   {
     SaveTapeChecked(tape.level_nr);	/* ask to save tape */
   }
 
+  CloseDoor(DOOR_CLOSE_ALL);
+
   if (level_editor_test_game)
   {
     game_status = GAME_MODE_MAIN;
@@ -4433,6 +4434,9 @@ void GameEnd()
   {
     game_status = GAME_MODE_SCORES;
 
+    /* needed if different viewport properties defined for scores */
+    ChangeViewportPropertiesIfNeeded();
+
     DrawHallOfFame(hi_pos);
 
     if (raise_level)
@@ -11188,7 +11192,32 @@ void GameActions()
   }
   else
   {
-    GameActions_RND();
+    GameActions_RND_Main();
+  }
+
+  BlitScreenToBitmap(backbuffer);
+
+  CheckLevelTime();
+
+  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
+
+  if (options.debug)			/* calculate frames per second */
+  {
+    static unsigned int fps_counter = 0;
+    static int fps_frames = 0;
+    unsigned int fps_delay_ms = Counter() - fps_counter;
+
+    fps_frames++;
+
+    if (fps_delay_ms >= 500)	/* calculate fps every 0.5 seconds */
+    {
+      global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
+
+      fps_frames = 0;
+      fps_counter = Counter();
+    }
+
+    redraw_mask |= REDRAW_FPS;
   }
 }
 
@@ -11202,10 +11231,6 @@ void GameActions_EM_Main()
     effective_action[i] = stored_player[i].effective_action;
 
   GameActions_EM(effective_action, warp_mode);
-
-  CheckLevelTime();
-
-  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
 }
 
 void GameActions_SP_Main()
@@ -11218,10 +11243,11 @@ void GameActions_SP_Main()
     effective_action[i] = stored_player[i].effective_action;
 
   GameActions_SP(effective_action, warp_mode);
+}
 
-  CheckLevelTime();
-
-  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
+void GameActions_RND_Main()
+{
+  GameActions_RND();
 }
 
 void GameActions_RND()
@@ -11723,32 +11749,9 @@ void GameActions_RND()
   }
 #endif
 
-  CheckLevelTime();
-
   DrawAllPlayers();
   PlayAllPlayersSound();
 
-  if (options.debug)			/* calculate frames per second */
-  {
-    static unsigned int fps_counter = 0;
-    static int fps_frames = 0;
-    unsigned int fps_delay_ms = Counter() - fps_counter;
-
-    fps_frames++;
-
-    if (fps_delay_ms >= 500)	/* calculate fps every 0.5 seconds */
-    {
-      global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
-
-      fps_frames = 0;
-      fps_counter = Counter();
-    }
-
-    redraw_mask |= REDRAW_FPS;
-  }
-
-  AdvanceFrameAndPlayerCounters(-1);	/* advance counters for all players */
-
   if (local_player->show_envelope != 0 && local_player->MovPos == 0)
   {
     ShowEnvelope(local_player->show_envelope - EL_ENVELOPE_1);
@@ -11802,16 +11805,16 @@ static boolean AllPlayersInVisibleScreen()
 
 void ScrollLevel(int dx, int dy)
 {
-  int softscroll_offset = (setup.soft_scrolling ? 2 * TILEX_VAR : 0);
+  int scroll_offset = 2 * TILEX_VAR;
   int x, y;
 
   BlitBitmap(drawto_field, drawto_field,
-	     FX + TILEX_VAR * (dx == -1) - softscroll_offset,
-	     FY + TILEY_VAR * (dy == -1) - softscroll_offset,
-	     SXSIZE - TILEX_VAR * (dx != 0) + 2 * softscroll_offset,
-	     SYSIZE - TILEY_VAR * (dy != 0) + 2 * softscroll_offset,
-	     FX + TILEX_VAR * (dx == 1) - softscroll_offset,
-	     FY + TILEY_VAR * (dy == 1) - softscroll_offset);
+	     FX + TILEX_VAR * (dx == -1) - scroll_offset,
+	     FY + TILEY_VAR * (dy == -1) - scroll_offset,
+	     SXSIZE - TILEX_VAR * (dx != 0) + 2 * scroll_offset,
+	     SYSIZE - TILEY_VAR * (dy != 0) + 2 * scroll_offset,
+	     FX + TILEX_VAR * (dx == 1) - scroll_offset,
+	     FY + TILEY_VAR * (dy == 1) - scroll_offset);
 
   if (dx != 0)
   {