From: Florian Forster <supertux@octo.it>
Date: Tue, 2 Mar 2010 11:54:42 +0000 (+0000)
Subject: Short Fuse: Make badguy shootable with the fireflower.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=94c343fe007df486b60f62b3558d7318bbbc2f68;p=supertux.git

Short Fuse: Make badguy shootable with the fireflower.

Seemed illogical not to.

SVN-Revision: 6513
---

diff --git a/data/levels/test/short_fuse.stl b/data/levels/test/short_fuse.stl
index 6a86d649f..bab79026c 100644
--- a/data/levels/test/short_fuse.stl
+++ b/data/levels/test/short_fuse.stl
@@ -58,6 +58,30 @@
       (x 2304)
       (y 832)
     )
+    (short_fuse
+      (x 2624)
+      (y 1024)
+    )
+    (short_fuse
+      (x 2752)
+      (y 1024)
+    )
+    (short_fuse
+      (x 2688)
+      (y 1024)
+    )
+    (short_fuse
+      (x 2496)
+      (y 1024)
+    )
+    (short_fuse
+      (x 2400)
+      (y 1024)
+    )
+    (short_fuse
+      (x 2336)
+      (y 1024)
+    )
     (spawnpoint
       (name "main")
       (x 32)
@@ -98,8 +122,8 @@
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      50 49 102 102 0 0 0 140 140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49
       51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52
       50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49
       51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52
diff --git a/src/badguy/short_fuse.cpp b/src/badguy/short_fuse.cpp
index db16a61ab..ae0c05cc2 100644
--- a/src/badguy/short_fuse.cpp
+++ b/src/badguy/short_fuse.cpp
@@ -97,5 +97,12 @@ ShortFuse::collision_player (Player& player, const CollisionHit&)
   return ABORT_MOVE;
 }
 
+void
+ShortFuse::kill_fall (void)
+{
+  explode ();
+  run_dead_script ();
+}
+
 /* vim: set sw=2 sts=2 et : */
 /* EOF */
diff --git a/src/badguy/short_fuse.hpp b/src/badguy/short_fuse.hpp
index e6d497b15..4c90fb6b3 100644
--- a/src/badguy/short_fuse.hpp
+++ b/src/badguy/short_fuse.hpp
@@ -29,6 +29,7 @@ public:
 protected:
   HitResponse collision_player (Player& player, const CollisionHit& hit);
   bool collision_squished (GameObject& object);
+  void kill_fall (void);
   void explode (void);
 };