Doors can run scripts now.

SVN-Revision: 6257

diff --git a/data/levels/test/doortest.stl b/data/levels/test/doortest.stl
new file mode 100644 (file)
index 0000000..8d1bb57
--- /dev/null
+++ b/data/levels/test/doortest.stl
@@ -0,0 +1,65 @@
+(supertux-level\r
+  (version 2)\r
+  (name (_ "Door Test"))\r
+  (author "Mathnerd314")\r
+  (sector\r
+    (name "main")\r
+    (music "music/chipdisko.ogg")\r
+    (ambient-light 1 1 1)\r
+    (background\r
+      (speed 0.5)\r
+      (image "images/background/arctis.jpg")\r
+    )\r
+    (camera\r
+      (mode "normal")\r
+    )\r
+    (door\r
+      (x 288)\r
+      (y 448)\r
+      (script "ghost()")\r
+    )\r
+    (door\r
+      (x 384)\r
+      (y 448)\r
+      (sector "main")\r
+      (spawnpoint "test")\r
+    )\r
+    (spawnpoint\r
+      (name "main")\r
+      (x 100)\r
+      (y 100)\r
+    )\r
+    (spawnpoint\r
+      (name "test")\r
+      (x 500)\r
+      (y 100)\r
+    )\r
+    (tilemap\r
+      (solid #t)\r
+      (z-pos 0)\r
+      (width 27)\r
+      (height 19)\r
+      (tiles\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
+      7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0\r
+      13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0\r
+      10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0\r
+      )\r
+    )\r
+  )\r
+)\r

diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
index c1418d8..56060d4 100644 (file)
--- a/src/trigger/door.cpp
+++ b/src/trigger/door.cpp
@@ -19,6 +19,7 @@
 #include "sprite/sprite_manager.hpp"
 #include "supertux/game_session.hpp"
 #include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 #include "trigger/door.hpp"
 #include "util/reader.hpp"
 
@@ -34,6 +35,8 @@ Door::Door(const Reader& reader) :
   reader.get("sector", target_sector);
   reader.get("spawnpoint", target_spawnpoint);
 
+  reader.get("script", script);
+
   sprite = sprite_manager->create("images/objects/door/door.sprite");
   sprite->set_action("closed");
   bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
@@ -136,7 +139,14 @@ Door::collision(GameObject& other, const CollisionHit& hit)
       if (player) {
         state = CLOSING;
         sprite->set_action("closing", 1);
-        GameSession::current()->respawn(target_sector, target_spawnpoint);
+        if(script != "") {
+          std::istringstream stream(script);
+          Sector::current()->run_script(stream, "Door");
+        }
+
+        if(target_sector != "") {
+          GameSession::current()->respawn(target_sector, target_spawnpoint);
+        }
       }
     }
     break;

diff --git a/src/trigger/door.hpp b/src/trigger/door.hpp
index 41e1a14..0fefb7e 100644 (file)
--- a/src/trigger/door.hpp
+++ b/src/trigger/door.hpp
@@ -46,6 +46,7 @@ private:
   DoorState state; /**< current state of the door */
   std::string target_sector; /**< target sector to teleport to */
   std::string target_spawnpoint; /**< target spawnpoint to teleport to */
+  std::string script;
   SpritePtr sprite; /**< "door" sprite to render */
   Timer stay_open_timer; /**< time until door will close again */
 };