rnd-20070902-1-src

* added several fixes to the extended (R'n'D based) EMC graphics engine

diff --git a/ChangeLog b/ChangeLog
index 7487985239adeebd7171f4e0649a3323abe8ad44..13e3f3939670705e20f9cea780f135fa5127444c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
          triggering player bit mask and handling all players in "move player"
        * fixed bug when defined artwork cannot be found for artwork that has
          default artwork cloned from other artwork (without default filename)
          triggering player bit mask and handling all players in "move player"
        * fixed bug when defined artwork cannot be found for artwork that has
          default artwork cloned from other artwork (without default filename)

+       * added several fixes to the extended (R'n'D based) EMC graphics engine

 
 2007-08-26
        * fixed broken editor copy and paste for custom elements between levels
 
 2007-08-26
        * fixed broken editor copy and paste for custom elements between levels

diff --git a/src/conftime.h b/src/conftime.h
index edaa513c57853dff13acc3cf4585033edcbdf419..aedf8caff92e02ba55aa45c0ac92ce8b30578489 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-09-01 21:53"
+#define COMPILE_DATE_STRING "2007-09-02 00:58"

diff --git a/src/engines.h b/src/engines.h
index 998a22ca429348cc79fe4b7001fa9afbadb4bb94..6b845c68ebf9a730f1ee136a16568a1419b412b4 100644 (file)
--- a/src/engines.h
+++ b/src/engines.h
@@ -15,6 +15,7 @@
 #define ENGINES_H
 
 #include "libgame/libgame.h"
 #define ENGINES_H
 
 #include "libgame/libgame.h"

+#include "game_em/export.h"

 
 
 /* ========================================================================= */
 
 
 /* ========================================================================= */


@@ -34,8 +35,7 @@ extern void PlayLevelSound_EM(int, int, int, int);
 extern void InitGraphicInfo_EM(void);
 
 void SetGfxAnimation_EM(int, int, int, int);
 extern void InitGraphicInfo_EM(void);
 
 void SetGfxAnimation_EM(int, int, int, int);

-void getGraphicSourceObjectExt_EM(int, int, Bitmap **, int *, int *,
-                                 Bitmap **, int *, int *, int, int);
+void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *, int, int, int, int);

 void getGraphicSourcePlayerExt_EM(int, int, int, Bitmap **, int *, int *);
 
 #endif /* ENGINES_H */
 void getGraphicSourcePlayerExt_EM(int, int, int, Bitmap **, int *, int *);
 
 #endif /* ENGINES_H */

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index a908126ccc1d142bd65701d91618abcefd7ac415..d49af1d19357d01eefe1d1d0e4144fcb243c1e5c 100644 (file)
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -149,11 +149,26 @@ static struct GraphicInfo_EM *getObjectGraphic(int x, int y)
   int tile = Draw[y][x];
   struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
 
   int tile = Draw[y][x];
   struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
 

+#if 0
+  int foo = (int)g->crumbled_bitmap;
+#endif
+
+#if 1
+  if (!game.use_native_emc_graphics_engine)
+    getGraphicSourceObjectExt_EM(g, tile, frame, x - 2, y - 2);
+#else

   if (!game.use_native_emc_graphics_engine)
     getGraphicSourceObjectExt_EM(tile, frame, &g->bitmap, &g->src_x, &g->src_y,
                                 &g->crumbled_bitmap,
                                 &g->crumbled_src_x, &g->crumbled_src_y,
                                 x - 2, y - 2);
   if (!game.use_native_emc_graphics_engine)
     getGraphicSourceObjectExt_EM(tile, frame, &g->bitmap, &g->src_x, &g->src_y,
                                 &g->crumbled_bitmap,
                                 &g->crumbled_src_x, &g->crumbled_src_y,
                                 x - 2, y - 2);

+#endif
+
+#if 0
+  if (foo != g->crumbled_bitmap)
+    printf("::: tile %d, %08x --> %08x\n", tile, foo, g->crumbled_bitmap);
+#endif
+

   return g;
 }
 
   return g;
 }
 

diff --git a/src/tools.c b/src/tools.c
index f3e1db886f2345ace63cdd0f94f8bc3841bdd4a6..28f7d9e57b3cb8f7c4efeb21fcecc1e874ccabea 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -5982,6 +5982,210 @@ void SetGfxAnimation_EM(int tile, int frame_em, int x, int y)
 #endif
 }
 
 #endif
 }
 

+#if 1
+
+int get_effective_element_EM(int tile, int frame)
+{
+  int i = tile;
+  int j = 7 - frame;
+
+  int element         = object_mapping[tile].element_rnd;
+  int action          = object_mapping[tile].action;
+  int direction       = object_mapping[tile].direction;
+  boolean is_backside = object_mapping[tile].is_backside;
+  boolean action_removing = (action == ACTION_DIGGING ||
+                            action == ACTION_SNAPPING ||
+                            action == ACTION_COLLECTING);
+#if 0
+  boolean action_exploding = ((action == ACTION_EXPLODING ||
+                              action == ACTION_SMASHED_BY_ROCK ||
+                              action == ACTION_SMASHED_BY_SPRING) &&
+                             element != EL_DIAMOND);
+  boolean action_active = (action == ACTION_ACTIVE);
+  boolean action_other = (action == ACTION_OTHER);
+#endif
+
+  {
+    {
+      int effective_element = (j > 5 && i == Yacid_splash_eB ? EL_EMPTY :
+                              j > 5 && i == Yacid_splash_wB ? EL_EMPTY :
+                              j < 7 ? element :
+                              i == Xdrip_stretch ? element :
+                              i == Xdrip_stretchB ? element :
+                              i == Ydrip_s1 ? element :
+                              i == Ydrip_s1B ? element :
+                              i == Xball_1B ? element :
+                              i == Xball_2 ? element :
+                              i == Xball_2B ? element :
+                              i == Yball_eat ? element :
+                              i == Ykey_1_eat ? element :
+                              i == Ykey_2_eat ? element :
+                              i == Ykey_3_eat ? element :
+                              i == Ykey_4_eat ? element :
+                              i == Ykey_5_eat ? element :
+                              i == Ykey_6_eat ? element :
+                              i == Ykey_7_eat ? element :
+                              i == Ykey_8_eat ? element :
+                              i == Ylenses_eat ? element :
+                              i == Ymagnify_eat ? element :
+                              i == Ygrass_eat ? element :
+                              i == Ydirt_eat ? element :
+                              i == Yemerald_stone ? EL_EMERALD :
+                              i == Ydiamond_stone ? EL_ROCK :
+                              i == Xsand_stonein_1 ? element :
+                              i == Xsand_stonein_2 ? element :
+                              i == Xsand_stonein_3 ? element :
+                              i == Xsand_stonein_4 ? element :
+                              is_backside ? EL_EMPTY :
+                              action_removing ? EL_EMPTY :
+                              element);
+
+      return effective_element;
+    }
+  }
+}
+
+void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em,
+                                 int tile, int frame_em, int x, int y)
+{
+  int element         = object_mapping[tile].element_rnd;
+  int action          = object_mapping[tile].action;
+  int direction       = object_mapping[tile].direction;
+  boolean is_backside = object_mapping[tile].is_backside;
+  boolean action_removing = (action == ACTION_DIGGING ||
+                            action == ACTION_SNAPPING ||
+                            action == ACTION_COLLECTING);
+#if 1
+  int effective_element = get_effective_element_EM(tile, frame_em);
+#else
+  int effective_element = (frame_em > 0 ? element :
+                          is_backside ? EL_EMPTY :
+                          action_removing ? EL_EMPTY :
+                          element);
+#endif
+  int graphic = (direction == MV_NONE ?
+                el_act2img(effective_element, action) :
+                el_act_dir2img(effective_element, action, direction));
+  int crumbled = (direction == MV_NONE ?
+                 el_act2crm(effective_element, action) :
+                 el_act_dir2crm(effective_element, action, direction));
+  int base_graphic = el_act2img(effective_element, ACTION_DEFAULT);
+  int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT);
+  boolean has_crumbled_graphics = (base_crumbled != base_graphic);
+  struct GraphicInfo *g = &graphic_info[graphic];
+  struct GraphicInfo *g_crumbled = &graphic_info[crumbled];
+  int sync_frame;
+
+#if 0
+  printf("::: GET: %d, %d: '%s'\n", x, y, EL_NAME(element));
+#endif
+
+#if 0
+  if (GfxFrame[x][y] < 8)
+    printf("::: %d, %d: %d [%s]\n", x, y, GfxFrame[x][y], EL_NAME(element));
+#endif
+
+#if 1
+  if (frame_em == 7)   /* reset animation frame for certain elements */
+  {
+    if (tile == Xboom_1 ||
+       tile == Xdynamite_1 ||
+       tile == Ybug_w_n ||
+       tile == Ybug_n_e ||
+       tile == Ybug_e_s ||
+       tile == Ybug_s_w ||
+       tile == Ybug_e_n ||
+       tile == Ybug_s_e ||
+       tile == Ybug_w_s ||
+       tile == Ybug_n_w ||
+       tile == Ytank_w_n ||
+       tile == Ytank_n_e ||
+       tile == Ytank_e_s ||
+       tile == Ytank_s_w ||
+       tile == Ytank_e_n ||
+       tile == Ytank_s_e ||
+       tile == Ytank_w_s ||
+       tile == Ytank_n_w)
+      GfxFrame[x][y] = 0;
+  }
+#endif
+
+#if 1
+  if (graphic_info[graphic].anim_global_sync)
+    sync_frame = FrameCounter;
+  else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY))
+    sync_frame = GfxFrame[x][y];
+  else
+    sync_frame = 0;    /* steel border */
+#else
+  if (graphic_info[graphic].anim_global_sync)
+    sync_frame = FrameCounter;
+  else
+    sync_frame = 7 - frame_em;
+#endif
+
+  SetRandomAnimationValue(x, y);
+
+  int frame = getAnimationFrame(g->anim_frames,
+                               g->anim_delay,
+                               g->anim_mode,
+                               g->anim_start_frame,
+                               sync_frame);
+
+#if 0
+  if (graphic == IMG_DEFAULT_EXPLODING)
+    printf("::: IMG_DEFAULT_EXPLODING: (%d, %d), %d => %d [%d]\n",
+          tile, frame_em, sync_frame, frame, Xboom_1);
+#endif
+
+  getGraphicSourceExt(graphic, frame, &g_em->bitmap,
+                     &g_em->src_x, &g_em->src_y, FALSE);
+
+#if 0
+  if (x == 1 && y == 1 && frame == 0)
+    printf("--> %d, %d, %d\n", *crumbled_src_x, *crumbled_src_y, tile);
+#endif
+
+#if 0
+  getGraphicSource(crumbled, frame, crumbled_src_bitmap,
+                  crumbled_src_x, crumbled_src_y);
+#endif
+
+#if 1
+  /* (updating the "crumbled" graphic definitions is probably not really needed,
+     as animations for crumbled graphics can't be longer than one EMC cycle) */
+
+#if 0
+  if (g_em->crumbled_bitmap != NULL &&
+      !(has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE))
+    printf("::: CRUMBLED CHANGES FOR tile %d [%s] [%d]\n",
+          tile, EL_NAME(element), Ydirt_eat);
+#endif
+
+  g_em->crumbled_bitmap = NULL;
+  g_em->crumbled_src_x = 0;
+  g_em->crumbled_src_y = 0;
+
+  g_em->has_crumbled_graphics = FALSE;
+
+  if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE)
+  {
+    int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames,
+                                          g_crumbled->anim_delay,
+                                          g_crumbled->anim_mode,
+                                          g_crumbled->anim_start_frame,
+                                          sync_frame);
+
+    getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap,
+                    &g_em->crumbled_src_x, &g_em->crumbled_src_y);
+
+    g_em->has_crumbled_graphics = TRUE;
+  }
+#endif
+}
+
+#else
+

 void getGraphicSourceObjectExt_EM(int tile, int frame_em,
                                  Bitmap **src_bitmap, int *src_x, int *src_y,
                                  Bitmap **crumbled_src_bitmap,
 void getGraphicSourceObjectExt_EM(int tile, int frame_em,
                                  Bitmap **src_bitmap, int *src_x, int *src_y,
                                  Bitmap **crumbled_src_bitmap,


@@ -6021,6 +6225,30 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em,
     printf("::: %d, %d: %d [%s]\n", x, y, GfxFrame[x][y], EL_NAME(element));
 #endif
 
     printf("::: %d, %d: %d [%s]\n", x, y, GfxFrame[x][y], EL_NAME(element));
 #endif
 

+#if 1
+  if (frame_em == 7)   /* reset animation frame for certain elements */
+  {
+    if (tile == Xboom_1 ||
+       tile == Ybug_w_n ||
+       tile == Ybug_n_e ||
+       tile == Ybug_e_s ||
+       tile == Ybug_s_w ||
+       tile == Ybug_e_n ||
+       tile == Ybug_s_e ||
+       tile == Ybug_w_s ||
+       tile == Ybug_n_w ||
+       tile == Ytank_w_n ||
+       tile == Ytank_n_e ||
+       tile == Ytank_e_s ||
+       tile == Ytank_s_w ||
+       tile == Ytank_e_n ||
+       tile == Ytank_s_e ||
+       tile == Ytank_w_s ||
+       tile == Ytank_n_w)
+      GfxFrame[x][y] = 0;
+  }
+#endif
+

 #if 1
   if (graphic_info[graphic].anim_global_sync)
     sync_frame = FrameCounter;
 #if 1
   if (graphic_info[graphic].anim_global_sync)
     sync_frame = FrameCounter;


@@ -6043,6 +6271,12 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em,
                                g->anim_start_frame,
                                sync_frame);
 
                                g->anim_start_frame,
                                sync_frame);
 

+#if 0
+  if (graphic == IMG_DEFAULT_EXPLODING)
+    printf("::: IMG_DEFAULT_EXPLODING: (%d, %d), %d => %d [%d]\n",
+          tile, frame_em, sync_frame, frame, Xboom_1);
+#endif
+

   getGraphicSourceExt(graphic, frame, src_bitmap, src_x, src_y, FALSE);
 
 #if 0
   getGraphicSourceExt(graphic, frame, src_bitmap, src_x, src_y, FALSE);
 
 #if 0


@@ -6077,6 +6311,8 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em,
 #endif
 }
 
 #endif
 }
 

+#endif
+

 void getGraphicSourcePlayerExt_EM(int player_nr, int anim, int frame_em,
                                  Bitmap **src_bitmap, int *src_x, int *src_y)
 {
 void getGraphicSourcePlayerExt_EM(int player_nr, int anim, int frame_em,
                                  Bitmap **src_bitmap, int *src_x, int *src_y)
 {


@@ -6463,7 +6699,9 @@ void InitGraphicInfo_EM(void)
                 frame);
 #endif
 
                 frame);
 #endif
 

-
+#if 0
+       printf("::: EMC tile %d is crumbled\n", i);
+#endif

       }
 
 #if 0
       }
 
 #if 0