X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=eed798b4943397ccd2470140d094472911677ab9;hb=c734235e0757e54dfdf6645d07a76c2a0bc591ba;hp=3d9649800fc49f31e9da3dce82c8a02750c561e1;hpb=d7bde1388f184dfb73b68c977917462e02f9b61f;p=rocksndiamonds.git

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index 3d964980..eed798b4 100644
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -107,7 +107,7 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap)
   }
 }
 
-void BackToFront_EM(void)
+static void BackToFront_EM(void)
 {
   BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY);
 }
@@ -118,7 +118,7 @@ static struct GraphicInfo_EM *getObjectGraphic(int x, int y)
   struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
 
   if (!game.use_native_emc_graphics_engine)
-    getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - 2, y - 2);
+    getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - lev.left, y - lev.top);
 
   return g;
 }
@@ -305,10 +305,11 @@ static void animscreen(void)
   };
 
   if (!game.use_native_emc_graphics_engine)
-    for (y = 2; y < CAVE_BUFFER_HEIGHT - 2; y++)
-      for (x = 2; x < CAVE_BUFFER_WIDTH - 2; x++)
+    for (y = lev.top; y < lev.bottom; y++)
+      for (x = lev.left; x < lev.right; x++)
 	SetGfxAnimation_EM(&graphic_info_em_object[lev.draw[x][y]][frame],
-			   lev.draw[x][y], 7 - frame, x - 2, y - 2);
+			   lev.draw[x][y], 7 - frame,
+			   x - lev.left, y - lev.top);
 
   for (y = top; y < top + MAX_BUF_YSIZE; y++)
   {
@@ -550,6 +551,7 @@ static boolean checkIfAllPlayersAreVisible(int center_x, int center_y)
 void RedrawPlayfield_EM(boolean force_redraw)
 {
   boolean draw_new_player_location = FALSE;
+  boolean draw_new_player_location_fast = FALSE;
   boolean quick_relocation = setup.quick_switch;
   int max_center_distance_player_nr =
     getMaxCenterDistancePlayerNr(screen_x, screen_y);
@@ -588,9 +590,11 @@ void RedrawPlayfield_EM(boolean force_redraw)
     game.centered_player_nr = game.centered_player_nr_next;
 
     draw_new_player_location = TRUE;
+    draw_new_player_location_fast = game.set_centered_player_fast;
     force_redraw = TRUE;
 
     game.set_centered_player = FALSE;
+    game.set_centered_player_fast = FALSE;
   }
 
   if (game.centered_player_nr == -1)
@@ -621,11 +625,16 @@ void RedrawPlayfield_EM(boolean force_redraw)
 
   if (draw_new_player_location && !quick_relocation)
   {
-    unsigned int game_frame_delay_value = getGameFrameDelay_EM(20);
-    int wait_delay_value = game_frame_delay_value;
+    unsigned int frame_delay_value_old = GetVideoFrameDelay();
+    int wait_delay_value = frame_delay_value_old;
     int screen_xx = VALID_SCREEN_X(sx);
     int screen_yy = VALID_SCREEN_Y(sy);
 
+    if (draw_new_player_location_fast)
+      wait_delay_value /= 4;
+
+    SetVideoFrameDelay(wait_delay_value);
+
     while (screen_x != screen_xx || screen_y != screen_yy)
     {
       int dx = (screen_xx < screen_x ? +1 : screen_xx > screen_x ? -1 : 0);
@@ -669,8 +678,6 @@ void RedrawPlayfield_EM(boolean force_redraw)
       BlitScreenToBitmap_EM(backbuffer);
       BackToFront_EM();
 
-      Delay(wait_delay_value);
-
       /* scroll second step to align at full tile size */
       screen_x -= dxx;
       screen_y -= dyy;
@@ -682,10 +689,10 @@ void RedrawPlayfield_EM(boolean force_redraw)
 
       BlitScreenToBitmap_EM(backbuffer);
       BackToFront_EM();
-
-      Delay(wait_delay_value);
     }
 
+    SetVideoFrameDelay(frame_delay_value_old);
+
     screen_x_old = screen_x;
     screen_y_old = screen_y;
   }