X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=29d9e15d9d19d5ca3f39c1051c87b0028335045f;hb=111f9432256ce35b49f4729fd94ee19e2a9b9110;hp=b443991d9e726d4e34cc38cbea9bbad15fe1631a;hpb=9f7cd608c28ded86b2c2e649c776220ae27df038;p=rocksndiamonds.git

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index b443991d..29d9e15d 100644
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -27,7 +27,7 @@
 				  (8 - frame) * ply[p].y) * TILEY / 8	\
 				 - ((SCR_FIELDY - 1) * TILEY) / 2)
 
-#define USE_EXTENDED_GRAPHICS_ENGINE		0
+#define USE_EXTENDED_GRAPHICS_ENGINE		1
 
 int frame;			/* current screen frame */
 int screen_x;			/* current scroll position */
@@ -144,17 +144,31 @@ void blitscreen(void)
   BackToFront_EM();
 }
 
-static void DrawLevelField_EM(int x, int y, int sx, int sy,
-			      boolean draw_masked)
+static struct GraphicInfo_EM *getObjectGraphic(int x, int y)
 {
   int tile = Draw[y][x];
   struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
 
-#if USE_EXTENDED_GRAPHICS_ENGINE
-  getGraphicSourceObjectExt_EM(tile, frame, &g->bitmap, &g->src_x, &g->src_y,
-			       x - 2, y - 2);
-#endif
+  if (!game.use_native_emc_graphics_engine)
+    getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - 2, y - 2);
+
+  return g;
+}
+
+static struct GraphicInfo_EM *getPlayerGraphic(int player_nr, int anim)
+{
+  struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame];
 
+  if (!game.use_native_emc_graphics_engine)
+    getGraphicSourcePlayerExt_EM(g, player_nr, anim, 7 - frame);
+
+  return g;
+}
+
+static void DrawLevelField_EM(int x, int y, int sx, int sy,
+			      boolean draw_masked)
+{
+  struct GraphicInfo_EM *g = getObjectGraphic(x, y);
   int src_x = g->src_x + g->src_offset_x;
   int src_y = g->src_y + g->src_offset_y;
   int dst_x = sx * TILEX + g->dst_offset_x;
@@ -193,8 +207,7 @@ static void DrawLevelField_EM(int x, int y, int sx, int sy,
 static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy,
 				      int crm, boolean draw_masked)
 {
-  int tile = Draw[y][x];
-  struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
+  struct GraphicInfo_EM *g = getObjectGraphic(x, y);
   int left = screen_x / TILEX;
   int top  = screen_y / TILEY;
   int i;
@@ -207,6 +220,13 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy,
   if (crm == 0)		/* no crumbled edges for this tile */
     return;
 
+#if 0
+  if (x == 3 && y == 3 && frame == 0)
+    printf("::: %d, %d\n",
+	   graphic_info_em_object[207][0].crumbled_src_x,
+	   graphic_info_em_object[207][0].crumbled_src_y);
+#endif
+
   for (i = 0; i < 4; i++)
   {
     if (crm & (1 << i))
@@ -253,13 +273,7 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy,
 static void DrawLevelPlayer_EM(int x1, int y1, int player_nr, int anim,
 			       boolean draw_masked)
 {
-  struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame];
-
-#if USE_EXTENDED_GRAPHICS_ENGINE
-  getGraphicSourcePlayerExt_EM(player_nr, anim, frame,
-			       &g->bitmap, &g->src_x, &g->src_y);
-#endif
-
+  struct GraphicInfo_EM *g = getPlayerGraphic(player_nr, anim);
   int src_x = g->src_x, src_y = g->src_y;
   int dst_x, dst_y;
 
@@ -337,6 +351,12 @@ static void animscreen(void)
     { 0, +1 }
   };
 
+  if (!game.use_native_emc_graphics_engine)
+    for (y = 2; y < EM_MAX_CAVE_HEIGHT - 2; y++)
+      for (x = 2; x < EM_MAX_CAVE_WIDTH - 2; x++)
+	SetGfxAnimation_EM(&graphic_info_em_object[Draw[y][x]][frame],
+			   Draw[y][x], 7 - frame, x - 2, y - 2);
+
   for (y = top; y < top + MAX_BUF_YSIZE; y++)
   {
     for (x = left; x < left + MAX_BUF_XSIZE; x++)
@@ -347,6 +367,7 @@ static void animscreen(void)
       struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
       int obj = g->unique_identifier;
       int crm = 0;
+      boolean redraw_screen_tile = FALSE;
 
       /* re-calculate crumbled state of this tile */
       if (g->has_crumbled_graphics)
@@ -368,12 +389,17 @@ static void animscreen(void)
 	}
       }
 
-      /* only redraw screen tiles if they (or their crumbled state) changed */
-#if USE_EXTENDED_GRAPHICS_ENGINE
-      // if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm)
-#else
-      if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm)
+      redraw_screen_tile = (screentiles[sy][sx]    != obj ||
+			    crumbled_state[sy][sx] != crm);
+
+#if 0
+      /* !!! TEST ONLY -- CHANGE THIS !!! */
+      if (!game.use_native_emc_graphics_engine)
+	redraw_screen_tile = TRUE;
 #endif
+
+      /* only redraw screen tiles if they (or their crumbled state) changed */
+      if (redraw_screen_tile)
       {
 	DrawLevelField_EM(x, y, sx, sy, FALSE);
 	DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE);
@@ -522,7 +548,7 @@ void DrawRelocatePlayer(struct PlayerInfo *player, boolean quick_relocation)
 
   if (quick_relocation)
   {
-    int offset = (setup.scroll_delay ? 3 : 0);
+    int offset = game.scroll_delay_value;
 
     if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy)))
     {
@@ -726,7 +752,7 @@ void RedrawPlayfield_EM(boolean force_redraw)
   int player_nr = game_em.last_moving_player;
 #endif
   int stepsize = TILEX / 8;
-  int offset = (setup.scroll_delay ? 3 : 0) * TILEX;
+  int offset = game.scroll_delay_value * TILEX;
   int offset_x = offset;
   int offset_y = offset;
   int screen_x_old = screen_x;