bonusblock can now contain custom MovingObjects, added possibility to execute script...

SVN-Revision: 2507

diff --git a/data/images/powerups/potions/blue-potion.png b/data/images/powerups/potions/blue-potion.png
new file mode 100644 (file)
index 0000000..d68fb70
Binary files /dev/null and b/data/images/powerups/potions/blue-potion.png differ

diff --git a/data/images/powerups/potions/red-potion.png b/data/images/powerups/potions/red-potion.png
new file mode 100644 (file)
index 0000000..2b498d2
Binary files /dev/null and b/data/images/powerups/potions/red-potion.png differ

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 7e785de..bb4fa03 100644 (file)
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -1572,4 +1572,21 @@
       (mirror-action "right")
     )
   )
+
+  (sprite
+    (name "red-potion")
+    (action
+      (name "default")
+      (images "powerups/potions/red-potion.png")
+    )
+  )
+
+  (sprite
+    (name "blue-potion")
+    (action
+      (name "default")
+      (images "powerups/potions/blue-potion.png")
+    )
+  )
 )
+

diff --git a/data/levels/test/bonusblock.stl b/data/levels/test/bonusblock.stl
index d719a60..4b8b60e 100644 (file)
--- a/data/levels/test/bonusblock.stl
+++ b/data/levels/test/bonusblock.stl
@@ -7,8 +7,6 @@
     (name  "main")
     (music  "theme.ogg")
     (gravity 10.000000)
-    (background (image "arctis.jpg")
-                (speed 0.5))
     (tilemap
       (layer  "background")
       (solid #f)
@@ -56,28 +54,28 @@
       (tiles
         61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 62 0 0 61 
+        61 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 62 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 61 
+        61 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
-        61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
+        61 0 0 0 0 0 62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
         61 0 0 0 0 0 0 26 0 83 0 0 0 102 0 102 0 0 0 128 0 0 0 103 0 0 0 0 0 61 
         61 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 
@@ -131,17 +129,58 @@
          (image "arctis.jpg")
          (speed 0.500000)
        )
-       (spawnpoint (name "main") (x 96) (y 160))
-        (secretarea (x 133.000015258789)
-                    (y 58.9999771118164)
-                    (width 730.504028320312)
-                    (height 127.476585388184)
-                    (message "This is a Secret Area Test"))
+       (background
+         (image "arctis.jpg")
+         (speed 0.500000)
+       )
+       (spawnpoint (name "main") (x 33) (y 160))
       (infoblock (x 128) (y 800)
         (message (_ "-Info
-#This is an info block
-#(WOW GREAT)
-#This rocks"))
+#Beware of these crazy
+#red potions.
+#Better seek for blue
+#potions."))
+      )
+       (bonusblock (x 96) (y 800)
+          (contents "custom")
+          (powerup
+            (sprite "red-potion")
+            (script "
+function wait(time) {
+  set_wakeup_time(time);
+  suspend();
+}
+
+DisplayEffect.set_black(true);
+wait(0.1);
+DisplayEffect.set_black(false);
+wait(0.07);
+DisplayEffect.set_black(true);
+wait(0.11);
+DisplayEffect.set_black(false);
+wait(0.09);
+DisplayEffect.set_black(true);
+wait(0.6);
+Level.flip_vertically();
+DisplayEffect.fade_in(1);
+")
+          )
+      )
+      (bonusblock (x 470) (y 96)
+        (contents "custom")
+        (powerup
+          (sprite "blue-potion")
+          (script "
+function wait(time) {
+  set_wakeup_time(time);
+  suspend();
+}
+DisplayEffect.fade_out(1);
+wait(1);
+Level.flip_vertically();
+DisplayEffect.fade_in(1);
+")
+        )
       )
    )
  )

diff --git a/data/levels/test/enemy3.stl b/data/levels/test/enemy3.stl
index 3e2eccc..2e08f90 100644 (file)
--- a/data/levels/test/enemy3.stl
+++ b/data/levels/test/enemy3.stl
@@ -79,10 +79,16 @@
     (mriceblock  (x 439) (y 159) (stay-on-platform #t))
     (mriceblock  (x 479) (y 159) (stay-on-platform #f))
     (zeekling  (x 1000) (y 140))
-    (powerup (x 900) (y 140) (type "star"))
-    (powerup (x 940) (y 140) (type "fireflower"))
-    (powerup (x 980) (y 140) (type "egg"))
-    (powerup (x 1020) (y 140) (type "1up"))
+    (powerup (x 900) (y 140) (sprite "star"))
+    (powerup (x 940) (y 140) (sprite "fireflower"))
+    (powerup (x 980) (y 140) (sprite "egg"))
+    (powerup (x 1020) (y 140) (sprite "1up"))
+    (powerup (x 1400) (y 140)
+      (sprite "red-potion")
+      (contents "custom")
+      (script "Level.flip_vertically();")
+    )
+    
     (trampoline (x 250) (y 150) (power 7.5))
     (dispenser (x 700) (y 100) (badguy "random") (cycle 1))
   )

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index daa9cf6..87faba0 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -21,6 +21,7 @@
 
 #include <float.h>
 #include <sstream>
+#include <memory>
 #include "yeti.h"
 #include "object/camera.h"
 #include "yeti_stalactite.h"
@@ -146,17 +147,8 @@ Yeti::collision_squished(Player& player)
 
     // start script
     if(dead_script != "") {
-      try {
-        ScriptInterpreter* interpreter 
-          = new ScriptInterpreter(GameSession::current()->get_working_directory());
-        interpreter->register_sector(Sector::current());
-        std::istringstream in(dead_script);
-        interpreter->load_script(in, "Yeti - dead-script");
-        interpreter->start_script();
-        Sector::current()->add_object(interpreter);
-      } catch(std::exception& e) {
-        std::cerr << "Couldn't execute yeti dead script: " << e.what() << "\n";
-      }
+      ScriptInterpreter::add_script_object(Sector::current(),
+          "Yeti - dead-script", dead_script);
     }
   } else {
     safe_timer.start(SAFE_TIME);

diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp
index 22f10d4..3fafbd5 100644 (file)
--- a/src/flip_level_transformer.cpp
+++ b/src/flip_level_transformer.cpp
@@ -21,6 +21,7 @@
 
 #include "flip_level_transformer.h"
 #include "object/tilemap.h"
+#include "object/camera.h"
 #include "badguy/badguy.h"
 #include "sector.h"
 #include "tile_manager.h"
@@ -40,20 +41,31 @@ FlipLevelTransformer::transform_sector(Sector* sector)
     if(tilemap) {
       transform_tilemap(tilemap);
     }
+    Player* player = dynamic_cast<Player*> (object);
+    if(player) {
+      Vector pos = player->get_pos();
+      pos.y = height - pos.y;
+      player->move(pos);
+      continue;
+    }
     BadGuy* badguy = dynamic_cast<BadGuy*> (object);
     if(badguy) {
       transform_badguy(height, badguy);
-    } else {
-      MovingObject* mobject = dynamic_cast<MovingObject*> (object);
-      if(mobject) {
-        transform_moving_object(height, mobject);
-      }
+      continue;
+    }
+    
+    MovingObject* mobject = dynamic_cast<MovingObject*> (object);
+    if(mobject) {
+      transform_moving_object(height, mobject);
     }
   }
   for(Sector::SpawnPoints::iterator i = sector->spawnpoints.begin();
       i != sector->spawnpoints.end(); ++i) {
     transform_spawnpoint(height, *i);
   }
+
+  if(sector->camera != 0 && sector->player != 0)
+    sector->camera->reset(sector->player->get_pos());
 }
 
 void
@@ -69,7 +81,11 @@ FlipLevelTransformer::transform_tilemap(TileMap* tilemap)
       tilemap->change(x, y2, t1->getID());
     }
   }
-  tilemap->set_drawing_effect(VERTICAL_FLIP);
+  if(tilemap->get_drawing_effect() != 0) {
+    tilemap->set_drawing_effect(0);
+  } else {
+    tilemap->set_drawing_effect(VERTICAL_FLIP);
+  }
 }
 
 void

diff --git a/src/object/block.cpp b/src/object/block.cpp
index ae01648..494d718 100644 (file)
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -17,10 +17,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include "block.h"
+
+#include <stdexcept>
+
 #include "resources.h"
 #include "player.h"
 #include "sector.h"
@@ -38,6 +40,8 @@
 #include "badguy/badguy.h"
 #include "coin.h"
 #include "object_factory.h"
+#include "lisp/list_iterator.h"
+#include "object_factory.h"
 
 static const float BOUNCY_BRICK_MAX_OFFSET=8;
 static const float BOUNCY_BRICK_SPEED=90;
@@ -117,7 +121,7 @@ Block::start_bounce()
 //---------------------------------------------------------------------------
 
 BonusBlock::BonusBlock(const Vector& pos, int data)
-  : Block(sprite_manager->create("bonusblock"))
+  : Block(sprite_manager->create("bonusblock")), object(0)
 {
   bbox.set_pos(pos);
   sprite->set_action("normal");
@@ -138,27 +142,55 @@ BonusBlock::BonusBlock(const lisp::Lisp& lisp)
   : Block(sprite_manager->create("bonusblock"))
 {
   Vector pos;
-  lisp.get("x", pos.x);
-  lisp.get("y", pos.y);
-  bbox.set_pos(pos);
 
-  std::string contentstring;
   contents = CONTENT_COIN;
-  if(lisp.get("contents", contentstring)) {
-    if(contentstring == "coin") {
-      contents = CONTENT_COIN;
-    } else if(contentstring == "firegrow") {
-      contents = CONTENT_FIREGROW;
-    } else if(contentstring == "icegrow") {
-      contents = CONTENT_ICEGROW;
-    } else if(contentstring == "star") {
-      contents = CONTENT_STAR;
-    } else if(contentstring == "1up") {
-      contents = CONTENT_1UP;
+  lisp::ListIterator iter(&lisp);
+  while(iter.next()) {
+    const std::string& token = iter.item();
+    if(token == "x") {
+      iter.value()->get(pos.x);
+    } else if(token == "y") {
+      iter.value()->get(pos.y);
+    } else if(token == "contents") {
+      std::string contentstring;
+      iter.value()->get(contentstring);
+      if(contentstring == "coin") {
+        contents = CONTENT_COIN;
+      } else if(contentstring == "firegrow") {
+        contents = CONTENT_FIREGROW;
+      } else if(contentstring == "icegrow") {
+        contents = CONTENT_ICEGROW;
+      } else if(contentstring == "star") {
+        contents = CONTENT_STAR;
+      } else if(contentstring == "1up") {
+        contents = CONTENT_1UP;
+      } else if(contentstring == "custom") {
+        contents = CONTENT_CUSTOM;
+      } else {
+        std::cerr << "Invalid box contents '" << contentstring << "'.\n";
+      }
     } else {
-      std::cerr << "Invalid box contents '" << contentstring << "'.\n";
-    }
+      if(contents == CONTENT_CUSTOM) {
+        GameObject* game_object = create_object(token, *(iter.lisp()));
+        object = dynamic_cast<MovingObject*> (game_object);
+        if(object == 0)
+          throw std::runtime_error(
+            "Only MovingObjects are allowed inside BonusBlocks");
+      } else {
+        std::cerr << "Invalid element '" << token << "' in bonusblock.\n";
+      }
+    }  
   }
+
+  if(contents == CONTENT_CUSTOM && object == 0)
+    throw std::runtime_error("Need to specify content object for custom block");
+  
+  bbox.set_pos(pos);
+}
+
+BonusBlock::~BonusBlock()
+{
+  delete object;
 }
 
 void
@@ -185,12 +217,11 @@ BonusBlock::try_open()
 
     case CONTENT_FIREGROW:
       if(player.get_status()->bonus == NO_BONUS) {
-        SpecialRiser* riser = new SpecialRiser(
-            new GrowUp(get_pos() + Vector(0, -32)));
+        SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp());
         sector->add_object(riser);
       } else {
         SpecialRiser* riser = new SpecialRiser(
-            new Flower(get_pos() + Vector(0, -32), Flower::FIREFLOWER));
+            get_pos(), new Flower(Flower::FIREFLOWER));
         sector->add_object(riser);
       }
       sound_manager->play_sound("upgrade");
@@ -198,12 +229,11 @@ BonusBlock::try_open()
 
     case CONTENT_ICEGROW:
       if(player.get_status()->bonus == NO_BONUS) {
-        SpecialRiser* riser = new SpecialRiser(
-            new GrowUp(get_pos() + Vector(0, -32)));
+        SpecialRiser* riser = new SpecialRiser(get_pos(), new GrowUp());
         sector->add_object(riser);                                            
       } else {
-        SpecialRiser* riser = new SpecialRiser(                               
-            new Flower(get_pos() + Vector(0, -32), Flower::ICEFLOWER));
+        SpecialRiser* riser = new SpecialRiser(
+            get_pos(), new Flower(Flower::ICEFLOWER));
         sector->add_object(riser);
       }      
       sound_manager->play_sound("upgrade");
@@ -217,6 +247,13 @@ BonusBlock::try_open()
       sector->add_object(new OneUp(get_pos()));
       break;
 
+    case CONTENT_CUSTOM:
+      SpecialRiser* riser = new SpecialRiser(get_pos(), object);
+      object = 0;
+      sector->add_object(riser);
+      sound_manager->play_sound("upgrade");
+      break;
+
     default:
       assert(false);
   }
@@ -225,7 +262,7 @@ BonusBlock::try_open()
   sprite->set_action("empty");
 }
 
-IMPLEMENT_FACTORY(BonusBlock, "bonusblock")
+IMPLEMENT_FACTORY(BonusBlock, "bonusblock");
 
 //---------------------------------------------------------------------------
 
@@ -286,4 +323,5 @@ Brick::try_break(bool playerhit)
   }
 }
 
-//IMPLEMENT_FACTORY(Brick, "brick")
+//IMPLEMENT_FACTORY(Brick, "brick");
+

diff --git a/src/object/block.h b/src/object/block.h
index 1650dbd..a6f9df1 100644 (file)
--- a/src/object/block.h
+++ b/src/object/block.h
@@ -52,6 +52,7 @@ class BonusBlock : public Block
 public:
   BonusBlock(const Vector& pos, int data);
   BonusBlock(const lisp::Lisp& lisp);
+  virtual ~BonusBlock();
 
   void try_open();
 
@@ -64,10 +65,12 @@ private:
     CONTENT_FIREGROW,
     CONTENT_ICEGROW,
     CONTENT_STAR,
-    CONTENT_1UP
+    CONTENT_1UP,
+    CONTENT_CUSTOM
   };
 
   Contents contents;
+  MovingObject* object;
 };
 
 class Brick : public Block

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index 9216d4e..974c277 100644 (file)
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -27,10 +27,9 @@
 #include "player.h"
 #include "sprite/sprite_manager.h"
 
-Flower::Flower(const Vector& pos, Type _type)
+Flower::Flower(Type _type)
   : type(_type)
 {
-  bbox.set_pos(pos);
   bbox.set_size(32, 32);
 
   if(_type == FIREFLOWER)

diff --git a/src/object/flower.h b/src/object/flower.h
index bfa950b..e91f38b 100644 (file)
--- a/src/object/flower.h
+++ b/src/object/flower.h
@@ -30,7 +30,7 @@ public:
   enum Type {
     FIREFLOWER, ICEFLOWER
   };
-  Flower(const Vector& pos, Type type);
+  Flower(Type type);
   ~Flower();
 
   virtual void update(float elapsed_time);

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 0499c85..da9aae1 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -27,9 +27,8 @@
 #include "player.h"
 #include "sprite/sprite_manager.h"
 
-GrowUp::GrowUp(const Vector& pos)
+GrowUp::GrowUp()
 {
-  bbox.set_pos(pos);
   bbox.set_size(32, 32);
   
   sprite = sprite_manager->create("egg");

diff --git a/src/object/growup.h b/src/object/growup.h
index 7976531..019d680 100644 (file)
--- a/src/object/growup.h
+++ b/src/object/growup.h
@@ -27,7 +27,7 @@
 class GrowUp : public MovingObject
 {
 public:
-  GrowUp(const Vector& pos);
+  GrowUp();
   ~GrowUp();
 
   virtual void update(float elapsed_time);

diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index dd6267b..3ba31df 100644 (file)
--- a/src/object/powerup.cpp
+++ b/src/object/powerup.cpp
@@ -26,14 +26,17 @@
 #include "sprite/sprite_manager.h"
 #include "object_factory.h"
 #include "sector.h"
+#include "scripting/script_interpreter.h"
 
 PowerUp::PowerUp(const lisp::Lisp& lisp)
 {
+  std::string sprite_name;
   lisp.get("x", bbox.p1.x);
   lisp.get("y", bbox.p1.y);
-  lisp.get("type", type);
+  lisp.get("sprite", sprite_name);
+  lisp.get("script", script);
   bbox.set_size(32, 32);   
-  sprite = sprite_manager->create(type);
+  sprite = sprite_manager->create(sprite_name);
   physic.enable_gravity(true);
 }
 
@@ -56,27 +59,30 @@ PowerUp::collision(GameObject& other, const CollisionHit& hit)
   }
   
   Player* player = dynamic_cast<Player*>(&other);
-  if(player != 0) {
-    if (type == "egg") {
-      player->set_bonus(GROWUP_BONUS, true);
-      sound_manager->play_sound("grow");
-    }
-    else if (type == "fireflower") {
-      player->set_bonus(FIRE_BONUS, true);
-      sound_manager->play_sound("fire-flower");
-    }
-    else if (type == "star") {
-      player->make_invincible();
-    }
-    else if (type == "1up") {
-      player->get_status()->incLives();
-    }    
-    remove_me();
-    
+  if(player == 0)
+    return FORCE_MOVE;
+
+  remove_me();
+
+  if (script != "") {
+    ScriptInterpreter::add_script_object(Sector::current(), "powerup-script",
+        script);
     return ABORT_MOVE;
   }
-
-  return FORCE_MOVE;
+  
+  // some defaults if no script has been set
+  if (sprite->get_name() == "egg") {
+    player->set_bonus(GROWUP_BONUS, true);
+    sound_manager->play_sound("grow");
+  } else if (sprite->get_name() == "fireflower") {
+    player->set_bonus(FIRE_BONUS, true);
+    sound_manager->play_sound("fire-flower");
+  } else if (sprite->get_name() == "star") {
+    player->make_invincible();
+  } else if (sprite->get_name() == "1up") {
+    player->get_status()->incLives();
+  }
+  return ABORT_MOVE;
 }
 
 void

diff --git a/src/object/powerup.h b/src/object/powerup.h
index a14d374..682d8be 100644 (file)
--- a/src/object/powerup.h
+++ b/src/object/powerup.h
@@ -1,4 +1,4 @@
-//  $Id: growup.h 2458 2005-05-10 11:29:58Z matzebraun $
+//  $Id$
 // 
 //  SuperTux
 //  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
@@ -39,7 +39,7 @@ public:
 private:
   Sprite* sprite;
   Physic physic;
-  std::string type;
+  std::string script;
 };
 
 #endif

diff --git a/src/object/specialriser.cpp b/src/object/specialriser.cpp
index ce14ad5..efcf59e 100644 (file)
--- a/src/object/specialriser.cpp
+++ b/src/object/specialriser.cpp
@@ -26,9 +26,10 @@
 #include "sector.h"
 #include "sprite/sprite_manager.h"
 
-SpecialRiser::SpecialRiser(MovingObject* _child)
+SpecialRiser::SpecialRiser(Vector pos, MovingObject* _child)
   : child(_child)
 {
+  _child->set_pos(pos - Vector(0, 32));
   offset = 0;
 }
 

diff --git a/src/object/specialriser.h b/src/object/specialriser.h
index fe5a9d4..89f9904 100644 (file)
--- a/src/object/specialriser.h
+++ b/src/object/specialriser.h
@@ -29,7 +29,7 @@
 class SpecialRiser : public GameObject
 {
 public:
-  SpecialRiser(MovingObject* child);
+  SpecialRiser(Vector pos, MovingObject* child);
   ~SpecialRiser();
 
   virtual void update(float elapsed_time);

diff --git a/src/object/tilemap.h b/src/object/tilemap.h
index d647a5e..6aa44ad 100644 (file)
--- a/src/object/tilemap.h
+++ b/src/object/tilemap.h
@@ -89,6 +89,11 @@ public:
     drawing_effect = effect;
   }
 
+  int get_drawing_effect()
+  {
+    return drawing_effect;
+  }
+
 private:
   typedef std::vector<uint32_t> Tiles;
   Tiles tiles;

diff --git a/src/scripting/script_interpreter.cpp b/src/scripting/script_interpreter.cpp
index 13e9494..2d273f2 100644 (file)
--- a/src/scripting/script_interpreter.cpp
+++ b/src/scripting/script_interpreter.cpp
@@ -196,3 +196,21 @@ void
 ScriptInterpreter::draw(DrawingContext& )
 {
 }
+
+void
+ScriptInterpreter::add_script_object(Sector* sector, const std::string& name,
+    const std::string& script)
+{
+  try {
+    std::auto_ptr<ScriptInterpreter> interpreter
+      (new ScriptInterpreter(GameSession::current()->get_working_directory()));
+    interpreter->register_sector(sector);
+    std::istringstream in(script);
+    interpreter->load_script(in, name);
+    interpreter->start_script();
+    sector->add_object(interpreter.release());
+  } catch(std::exception& e) {
+    std::cerr << "Couldn't start '" << name << "' script: " << e.what() << "\n";
+  }
+}
+

diff --git a/src/scripting/script_interpreter.h b/src/scripting/script_interpreter.h
index c4ecabc..9cb99c5 100644 (file)
--- a/src/scripting/script_interpreter.h
+++ b/src/scripting/script_interpreter.h
@@ -29,6 +29,12 @@ public:
 
   void set_wakeup_time(float seconds);
 
+  /** helper function that parses a script, starts it and adds it to the sector
+   * specified
+   */
+  static void add_script_object(Sector* sector, const std::string& scriptname,
+      const std::string& script);
+
   static ScriptInterpreter* current()
   {
     return _current;

diff --git a/src/scripting/sound.h b/src/scripting/sound.h
index 9467c1f..3486719 100644 (file)
--- a/src/scripting/sound.h
+++ b/src/scripting/sound.h
@@ -8,6 +8,9 @@ class Sound
 {
 public:
   void play_music(const std::string& musicfile);
+  /**
+   * Play a sound effect. The name should be without path or .wav extension
+   */
   void play_sound(const std::string& soundfile);
 
 #ifndef SCRIPTING_API

diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp
index ed511ff..8c3ff52 100644 (file)
--- a/src/scripting/wrapper.cpp
+++ b/src/scripting/wrapper.cpp
@@ -364,6 +364,50 @@ static int Text_set_visible_wrapper(HSQUIRRELVM v)
   return 0;
 }
 
+static int Player_set_bonus_wrapper(HSQUIRRELVM v)
+{
+  Scripting::Player* _this;
+  sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
+  const char* arg0;
+  sq_getstring(v, 2, &arg0);
+  
+  _this->set_bonus(arg0);
+  
+  return 0;
+}
+
+static int Player_make_invincible_wrapper(HSQUIRRELVM v)
+{
+  Scripting::Player* _this;
+  sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
+  
+  _this->make_invincible();
+  
+  return 0;
+}
+
+static int Player_add_life_wrapper(HSQUIRRELVM v)
+{
+  Scripting::Player* _this;
+  sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
+  
+  _this->add_life();
+  
+  return 0;
+}
+
+static int Player_add_coins_wrapper(HSQUIRRELVM v)
+{
+  Scripting::Player* _this;
+  sq_getinstanceup(v, 1, (SQUserPointer*) &_this, 0);
+  int arg0;
+  sq_getinteger(v, 2, &arg0);
+  
+  _this->add_coins(arg0);
+  
+  return 0;
+}
+
 static int display_text_file_wrapper(HSQUIRRELVM v)
 {
   const char* arg0;
@@ -449,6 +493,13 @@ static WrappedFunction supertux_Text_methods[] = {
   { "set_visible", &Text_set_visible_wrapper },
 };
 
+static WrappedFunction supertux_Player_methods[] = {
+  { "set_bonus", &Player_set_bonus_wrapper },
+  { "make_invincible", &Player_make_invincible_wrapper },
+  { "add_life", &Player_add_life_wrapper },
+  { "add_coins", &Player_add_coins_wrapper },
+};
+
 WrappedClass supertux_classes[] = {
   { "DisplayEffect", supertux_DisplayEffect_methods },
   { "Camera", supertux_Camera_methods },
@@ -456,6 +507,7 @@ WrappedClass supertux_classes[] = {
   { "ScriptedObject", supertux_ScriptedObject_methods },
   { "Sound", supertux_Sound_methods },
   { "Text", supertux_Text_methods },
+  { "Player", supertux_Player_methods },
   { 0, 0 }
 };
 

diff --git a/src/scripting/wrapper.interface.h b/src/scripting/wrapper.interface.h
index 761a166..e9645ec 100644 (file)
--- a/src/scripting/wrapper.interface.h
+++ b/src/scripting/wrapper.interface.h
@@ -6,4 +6,4 @@
 #include "sound.h"
 #include "text.h"
 #include "functions.h"
-
+#include "player.h"

diff --git a/src/sector.cpp b/src/sector.cpp
index 43743c7..1021ff5 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -422,19 +422,8 @@ Sector::activate(const std::string& spawnpoint)
 
   // Run init script
   if(init_script != "") {
-    try {
-      ScriptInterpreter* interpreter 
-        = new ScriptInterpreter(GameSession::current()->get_working_directory());
-      interpreter->register_sector(this);
-      std::string sourcename = std::string("Sector(") + name + ") - init";
-      std::istringstream in(init_script);
-      interpreter->load_script(in, sourcename);
-      interpreter->start_script();
-      add_object(interpreter);
-      init_script = "";
-    } catch(std::exception& e) {
-      std::cerr << "Couldn't execute init script: " << e.what() << "\n";
-    }
+    ScriptInterpreter::add_script_object(this,
+        std::string("Sector(") + name + ") - init", init_script);
   }
 }
 

diff --git a/src/trigger/scripttrigger.cpp b/src/trigger/scripttrigger.cpp
index 5c8ecd7..8d2a277 100644 (file)
--- a/src/trigger/scripttrigger.cpp
+++ b/src/trigger/scripttrigger.cpp
@@ -21,6 +21,8 @@
 #include <config.h>\r
 \r
 #include <sstream>\r
+#include <stdexcept>\r
+#include <memory>\r
 \r
 #include "scripttrigger.h"\r
 #include "game_session.h"\r
@@ -42,6 +44,9 @@ ScriptTrigger::ScriptTrigger(const lisp::Lisp& reader)
   bbox.set_size(w, h);\r
   reader.get("script", script);\r
   reader.get("button", must_activate);\r
+  if(script == "") {\r
+    throw std::runtime_error("Need to specify a script for trigger object");\r
+  }\r
   \r
   if (must_activate)\r
     triggerevent = EVENT_ACTIVATE;\r
@@ -79,30 +84,11 @@ ScriptTrigger::write(lisp::Writer& writer)
 void\r
 ScriptTrigger::event(Player& , EventType type)\r
 {\r
-  if(type == triggerevent)\r
-  {\r
-    if (script != "")\r
-    {\r
-      try\r
-      {\r
-        ScriptInterpreter* interpreter \r
-          = new ScriptInterpreter(GameSession::current()->get_working_directory());\r
-        interpreter->register_sector(Sector::current());\r
-        std::istringstream in(script);\r
-        interpreter->load_script(in, "trigger-script");\r
-        interpreter->start_script();\r
-        Sector::current()->add_object(interpreter);\r
-      }\r
-      catch(std::exception& e)\r
-      {\r
-          std::cerr << "Couldn't execute trigger script: " << e.what() << "\n";\r
-      }\r
-    }\r
-    else\r
-    {\r
-      std::cerr << "Couldn't find trigger script.\n";\r
-    }\r
-  }\r
+  if(type != triggerevent)\r
+    return;\r
+\r
+  ScriptInterpreter::add_script_object(Sector::current(), "trigger - scritp",\r
+      script);\r
 }\r
 \r
 IMPLEMENT_FACTORY(ScriptTrigger, "scripttrigger");\r

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 872c285..3649bab 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -843,11 +843,16 @@ WorldMap::update(float delta)
          the level (in case there is one), don't show anything */
       if(level_finished) {
         if (level->extro_script != "") {
-          ScriptInterpreter* interpreter = new ScriptInterpreter(levels_path);
-          std::istringstream in(level->extro_script);
-          interpreter->load_script(in, "level-extro-script");
-          interpreter->start_script();
-          add_object(interpreter);
+          try {
+            std::auto_ptr<ScriptInterpreter> interpreter 
+              (new ScriptInterpreter(levels_path));
+            std::istringstream in(level->extro_script);
+            interpreter->load_script(in, "level-extro-script");
+            interpreter->start_script();
+            add_object(interpreter.release());
+          } catch(std::exception& e) {
+            std::cerr << "Couldn't run level-extro-script:" << e.what() << "\n";
+          }
         }
 
         if (!level->next_worldmap.empty())
@@ -991,11 +996,17 @@ WorldMap::display()
   sound_manager->play_music(song);
 
   if(!intro_displayed && intro_script != "") {
-    ScriptInterpreter* interpreter = new ScriptInterpreter(levels_path);
-    std::istringstream in(intro_script);
-    interpreter->load_script(in, "worldmap-intro-script");
-    interpreter->start_script();
-    add_object(interpreter);
+    try {
+      std::auto_ptr<ScriptInterpreter> interpreter 
+        (new ScriptInterpreter(levels_path));
+      std::istringstream in(intro_script);
+      interpreter->load_script(in, "worldmap-intro-script");
+      interpreter->start_script();
+      add_object(interpreter.release());
+    } catch(std::exception& e) {
+      std::cerr << "Couldn't execute worldmap-intro-script: "
+        << e.what() << "\n";
+    }
                                            
     intro_displayed = true;
   }