Merge branch 'master' into releases

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

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index 455979ea932a8e43596930a79266f3caa0e78f2e..d7f7025ac6f28583e86234692e734bc0bc80263a 100644 (file)
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -201,14 +201,19 @@ void BackToFront_EM(void)
     boolean half_shifted_y = (EVEN(SCR_FIELDY) && screen_y % TILEY != 0);
 #endif
 
-    int sx, sy, sxsize, sysize;
+    int sx, sy;
+#if 0
+    int sxsize, sysize;
+#endif
     int xsize = SXSIZE;
     int ysize = SYSIZE;
     int full_xsize = lev.width  * TILEX;
     int full_ysize = lev.height * TILEY;
 
+#if 0
     sxsize = (full_xsize < xsize ? full_xsize : xsize);
     sysize = (full_ysize < ysize ? full_ysize : ysize);
+#endif
     sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0);
     sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0);
 
@@ -1008,9 +1013,9 @@ void RedrawPlayfield_EM(boolean force_redraw)
   if (draw_new_player_location && !quick_relocation)
   {
 #if 1
-    unsigned long game_frame_delay_value = getGameFrameDelay_EM(20);
+    unsigned int game_frame_delay_value = getGameFrameDelay_EM(20);
 #else
-    unsigned long game_frame_delay_value = getGameFrameDelay_EM(25);
+    unsigned int game_frame_delay_value = getGameFrameDelay_EM(25);
 #endif
     int wait_delay_value = game_frame_delay_value;
     int screen_xx = VALID_SCREEN_X(sx);