rnd-20030730-2-src

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index e7b996358e77ad7e6e1ab3b91fa42571753c36a1..97853144b22e327fa06080fe9c3097fc6758e7f8 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -34,6 +34,7 @@
 /* forward declaration for internal use */
 static void UnmapToolButtons();
 static void HandleToolButtons(struct GadgetInfo *);
+static int el_act_dir2crm(int, int, int);
 
 static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS];
 static int request_gadget_id = -1;
@@ -658,8 +659,13 @@ void DrawPlayer(struct PlayerInfo *player)
   {
     if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED)
     {
+#if 1
+      if (CAN_BE_CRUMBLED(GfxElement[jx][jy]))
+       DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame);
+#else
       if (GfxElement[jx][jy] == EL_SAND)
        DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame);
+#endif
       else
       {
        int old_element = GfxElement[jx][jy];
@@ -1200,7 +1206,8 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
   if (!IN_LEV_FIELD(x, y))
     return;
 
-  element = (GfxElement[x][y] != EL_UNDEFINED ? GfxElement[x][y] : Feld[x][y]);
+  element = (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ?
+            GfxElement[x][y] : Feld[x][y]);
 
   /* crumble field itself */
   if (CAN_BE_CRUMBLED(element) && !IS_MOVING(x, y))
@@ -1221,6 +1228,13 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame)
       if (CAN_BE_CRUMBLED(element) && !IS_MOVING(xx, yy))
        continue;
 
+#if 0
+      if (Feld[x][y] == EL_CUSTOM_START + 123)
+       printf("::: crumble [%d] THE CHAOS ENGINE (%d, %d): %d, %d\n",
+              i, Feld[x][y], element,
+              CAN_BE_CRUMBLED(element), IS_MOVING(x, y));
+#endif
+
       if (i == 1 || i == 2)
       {
        width = snip;
@@ -1290,8 +1304,13 @@ void DrawLevelFieldCrumbledSand(int x, int y)
 void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction,
                                       int step_frame)
 {
+#if 1
+  int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction);
+  int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction);
+#else
   int graphic1 = el_act_dir2img(EL_SAND,          ACTION_DIGGING, direction);
   int graphic2 = el_act_dir2img(EL_SAND_CRUMBLED, ACTION_DIGGING, direction);
+#endif
   int frame1 = getGraphicAnimationFrame(graphic1, step_frame);
   int frame2 = getGraphicAnimationFrame(graphic2, step_frame);
   int sx = SCREENX(x), sy = SCREENY(y);
@@ -2438,6 +2457,14 @@ int el_act_dir2img(int element, int action, int direction)
   return element_info[element].direction_graphic[action][direction];
 }
 
+static int el_act_dir2crm(int element, int action, int direction)
+{
+  element = GFX_ELEMENT(element);
+  direction = MV_DIR_BIT(direction);
+
+  return element_info[element].direction_crumbled[action][direction];
+}
+
 int el_act2img(int element, int action)
 {
   element = GFX_ELEMENT(element);