X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=8946e84b61b483d3d28b6578d487db5e6c6ceae9;hb=e0e2697df0d0da483a91b1248c120aef6b3caf9b;hp=05d2610d5ce7ec003a93db7e1864334dbcdb4dbb;hpb=20ac4856f1acb923be1793a0e9060987f15a1295;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 05d2610d..8946e84b 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -11,18 +11,11 @@
 * tools.c                                                  *
 ***********************************************************/
 
-#include <stdarg.h>
-
-#if defined(PLATFORM_FREEBSD)
-#include <machine/joystick.h>
-#endif
-
 #include "libgame/libgame.h"
 
 #include "tools.h"
 #include "game.h"
 #include "events.h"
-#include "joystick.h"
 #include "cartoons.h"
 #include "network.h"
 #include "tape.h"
@@ -434,7 +427,10 @@ void DrawPlayer(struct PlayerInfo *player)
     if (Store[last_jx][last_jy] && IS_DRAWABLE(last_element))
     {
       DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]);
-      DrawLevelFieldThruMask(last_jx, last_jy);
+      if (last_element == EL_DYNAMITE_ACTIVE)
+	DrawDynamite(last_jx, last_jy);
+      else
+	DrawLevelFieldThruMask(last_jx, last_jy);
     }
     else if (last_element == EL_DYNAMITE_ACTIVE)
       DrawDynamite(last_jx, last_jy);
@@ -467,6 +463,8 @@ void DrawPlayer(struct PlayerInfo *player)
     DrawLevelElement(jx, jy, Store[jx][jy]);
   else if (!IS_ACTIVE_BOMB(element))
     DrawLevelField(jx, jy);
+  else
+    DrawLevelElement(jx, jy, EL_LEERRAUM);
 
   /* draw player himself */
 
@@ -2277,13 +2275,6 @@ static struct
   }
 };
 
-#if 0
-static void DoNotDisplayInfoText(void *ptr)
-{
-  return;
-}
-#endif
-
 void CreateToolButtons()
 {
   int i;
@@ -2330,11 +2321,6 @@ void CreateToolButtons()
 		      GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
 		      GDI_DECORATION_SHIFTING, 1, 1,
 		      GDI_EVENT_MASK, event_mask,
-
-#if 0
-		      GDI_CALLBACK_INFO, DoNotDisplayInfoText,
-#endif
-
 		      GDI_CALLBACK_ACTION, HandleToolButtons,
 		      GDI_END);