X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=2f6bd8d81db5e07981795cfa56f471ba40bab659;hb=a047db7b385f7523ca97deb21fdc504f34a80c7e;hp=4661ac64efce1d4122d8ecd880ccabb375a4e574;hpb=c64be0354d88b9776537a907f524993e29e074aa;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 4661ac64..2f6bd8d8 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -40,6 +40,39 @@ static int el_act2crm(int, int);
 static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS];
 static int request_gadget_id = -1;
 
+void DumpTile(int x, int y)
+{
+  int sx = SCREENX(x);
+  int sy = SCREENX(y);
+
+  printf_line("-", 79);
+  printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
+  printf_line("-", 79);
+
+  if (!IN_LEV_FIELD(x, y))
+  {
+    printf("(not in level field)\n");
+    printf("\n");
+
+    return;
+  }
+
+  printf("  Feld:        %d ['%s']\n", Feld[x][y],
+	 element_info[Feld[x][y]].token_name);
+  printf("  Back:        %d\n", Back[x][y]);
+  printf("  Store:       %d\n", Store[x][y]);
+  printf("  Store2:      %d\n", Store2[x][y]);
+  printf("  StorePlayer: %d\n", StorePlayer[x][y]);
+  printf("  MovPos:      %d\n", MovPos[x][y]);
+  printf("  MovDir:      %d\n", MovDir[x][y]);
+  printf("  MovDelay:    %d\n", MovDelay[x][y]);
+  printf("  ChangeDelay: %d\n", ChangeDelay[x][y]);
+  printf("  GfxElement:  %d\n", GfxElement[x][y]);
+  printf("  GfxAction:   %d\n", GfxAction[x][y]);
+  printf("  GfxFrame:    %d\n", GfxFrame[x][y]);
+  printf("\n");
+}
+
 void SetDrawtoField(int mode)
 {
   if (mode == DRAW_BUFFERED && setup.soft_scrolling)
@@ -1485,7 +1518,13 @@ void DrawScreenField(int x, int y)
       DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode);
 
     if (content == EL_ACID)
-      DrawLevelElementThruMask(lx, ly + 1, EL_ACID);
+    {
+      int dir = MovDir[lx][ly];
+      int newlx = lx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
+      int newly = ly + (dir == MV_UP   ? -1 : dir == MV_DOWN  ? +1 : 0);
+
+      DrawLevelElementThruMask(newlx, newly, EL_ACID);
+    }
   }
   else if (IS_BLOCKED(lx, ly))
   {
@@ -2011,6 +2050,15 @@ boolean Request(char *text, unsigned int req_state)
     }
   }
 
+#if 1
+  /* disable deactivated drawing when quick-loading level tape recording */
+  if (tape.playing && tape.index_search)
+  {
+    SetDrawDeactivationMask(REDRAW_NONE);
+    audio.sound_deactivated = FALSE;
+  }
+#endif
+
 #if 1
   SetMouseCursor(CURSOR_DEFAULT);
 #endif
@@ -2274,6 +2322,15 @@ boolean Request(char *text, unsigned int req_state)
     SendToServer_ContinuePlaying();
 #endif
 
+#if 1
+  /* restore deactivated drawing when quick-loading level tape recording */
+  if (tape.playing && tape.index_search)
+  {
+    SetDrawDeactivationMask(REDRAW_FIELD);
+    audio.sound_deactivated = TRUE;
+  }
+#endif
+
   return result;
 }
 
@@ -2356,8 +2413,10 @@ unsigned int MoveDoor(unsigned int door_state)
     stepsize = 20;		/* must be choosen to always draw last frame */
     door_delay_value = 0;
 
+#if 0
     StopSound(SND_DOOR_OPENING);
     StopSound(SND_DOOR_CLOSING);
+#endif
   }
 
   if (global.autoplay_leveldir)
@@ -2375,7 +2434,7 @@ unsigned int MoveDoor(unsigned int door_state)
 	       door_1.anim_mode == ANIM_VERTICAL ? DYSIZE : DXSIZE);
     int x;
 
-    if (!(door_state & DOOR_NO_DELAY))
+    if (!(door_state & DOOR_NO_DELAY) && !setup.quick_doors)
     {
       /* opening door sound has priority over simultaneously closing door */
       if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
@@ -2558,11 +2617,13 @@ unsigned int MoveDoor(unsigned int door_state)
     }
   }
 
+#if 0
   if (setup.quick_doors)
   {
     StopSound(SND_DOOR_OPENING);
     StopSound(SND_DOOR_CLOSING);
   }
+#endif
 
   if (door_state & DOOR_ACTION_1)
     door1 = door_state & DOOR_ACTION_1;