moved calling EM engine logic to corresponding source file

[rocksndiamonds.git] / src / game_em / graphics.c

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index d103de7d7df0029cbe2685a5e44073c2a12f19e4..15b706602d52de900a8774e15eca2c2b9312eba4 100644 (file)
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -39,9 +39,13 @@ int frame;                           /* current screen frame */
 int screen_x, screen_y;                        /* current scroll position */
 
 /* tiles currently on screen */
-static int screentiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
+static int screen_tiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
 static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
 
+/* graphic info for game objects/frames and players/actions/frames */
+struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
+struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
+
 int getFieldbufferOffsetX_EM(void)
 {
   return screen_x % TILEX;
@@ -107,7 +111,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);
 }
@@ -343,7 +347,7 @@ static void animscreen(void)
        }
       }
 
-      redraw_screen_tile = (screentiles[sx][sy]    != obj ||
+      redraw_screen_tile = (screen_tiles[sx][sy]   != obj ||
                            crumbled_state[sx][sy] != crm);
 
       /* only redraw screen tiles if they (or their crumbled state) changed */
@@ -352,7 +356,7 @@ static void animscreen(void)
        DrawLevelField_EM(x, y, sx, sy, FALSE);
        DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE);
 
-       screentiles[sx][sy] = obj;
+       screen_tiles[sx][sy] = obj;
        crumbled_state[sx][sy] = crm;
       }
     }
@@ -422,8 +426,8 @@ static void blitplayer(struct PLAYER *ply)
     }
 
     /* redraw screen tiles in the next frame (player may have left the tiles) */
-    screentiles[old_sx][old_sy] = -1;
-    screentiles[new_sx][new_sy] = -1;
+    screen_tiles[old_sx][old_sy] = -1;
+    screen_tiles[new_sx][new_sy] = -1;
   }
 }
 
@@ -443,7 +447,7 @@ void game_initscreen(void)
   {
     for (x = 0; x < MAX_BUF_XSIZE; x++)
     {
-      screentiles[x][y] = -1;
+      screen_tiles[x][y] = -1;
       crumbled_state[x][y] = 0;
     }
   }
@@ -551,6 +555,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);
@@ -589,9 +594,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)
@@ -622,11 +629,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);
@@ -670,8 +682,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;
@@ -683,10 +693,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;
   }
@@ -697,7 +707,7 @@ void RedrawPlayfield_EM(boolean force_redraw)
     {
       for (x = 0; x < MAX_BUF_XSIZE; x++)
       {
-       screentiles[x][y] = -1;
+       screen_tiles[x][y] = -1;
        crumbled_state[x][y] = 0;
       }
     }