Added new "Explosion" object

[supertux.git] / src / badguy / badguy.cpp

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index e7bc8e6..19e8d8b 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -36,7 +36,9 @@ static const float X_OFFSCREEN_DISTANCE = 1600;
 static const float Y_OFFSCREEN_DISTANCE = 1200;
 
 BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer)
-  : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true), dir(LEFT), start_dir(AUTO), frozen(false), ignited(false), draw_dead_script_hint(false), state(STATE_INIT), on_ground_flag(false)
+  : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true),
+    dir(LEFT), start_dir(AUTO), frozen(false), ignited(false),
+    state(STATE_INIT), on_ground_flag(false)
 {
   start_position = bbox.p1;
 
@@ -45,7 +47,9 @@ BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer)
 }
 
 BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer)
-  : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true), dir(direction), start_dir(direction), frozen(false), ignited(false), draw_dead_script_hint(false), state(STATE_INIT), on_ground_flag(false)
+  : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true),
+    dir(direction), start_dir(direction), frozen(false), ignited(false),
+    state(STATE_INIT), on_ground_flag(false)
 {
   start_position = bbox.p1;
 
@@ -62,9 +66,8 @@ BadGuy::BadGuy(const lisp::Lisp& reader, const std::string& sprite_name, int lay
   reader.get("direction", dir_str);
   start_dir = str2dir( dir_str );
   dir = start_dir;
-  
+
   reader.get("dead-script", dead_script);
-  draw_dead_script_hint = (dead_script != "");
 
   sound_manager->preload("sounds/squish.wav");
   sound_manager->preload("sounds/fall.wav");
@@ -84,11 +87,6 @@ BadGuy::draw(DrawingContext& context)
     context.set_drawing_effect(old_effect);
   } else {
     sprite->draw(context, get_pos(), layer);
-    if (draw_dead_script_hint) {
-      Vector ppos = Vector(systemRandom.randf(bbox.p1.x+8, bbox.p2.x-8), bbox.p2.y);
-      Vector pspeed = Vector(0, -100);
-      Sector::current()->add_object(new Particles(ppos, 44, 46, pspeed, Vector(0,0), 1, Color(.6f, .2f, .2f), 3, .1f, LAYER_OBJECTS+1));
-    }
   }
 }
 
@@ -154,7 +152,7 @@ BadGuy::deactivate()
 }
 
 void
-BadGuy::save(lisp::Writer& )
+BadGuy::write(lisp::Writer& )
 {
   log_warning << "tried to write out a generic badguy" << std::endl;
 }
@@ -176,7 +174,7 @@ BadGuy::collision_tile(uint32_t tile_attributes)
   if(tile_attributes & Tile::HURTS) {
     if (tile_attributes & Tile::FIRE) {
       if (is_flammable()) ignite();
-    } 
+    }
     else if (tile_attributes & Tile::ICE) {
       if (is_freezable()) freeze();
     }
@@ -283,7 +281,7 @@ BadGuy::collision_bullet(Bullet& bullet, const CollisionHit& hit)
       bullet.ricochet(*this, hit);
       return FORCE_MOVE;
     }
-  } 
+  }
   else if (is_ignited()) {
     if(bullet.get_type() == ICE_BONUS) {
       // ice bullets extinguish ignited badguys
@@ -354,6 +352,19 @@ BadGuy::kill_fall()
 }
 
 void
+BadGuy::run_dead_script()
+{
+   if (countMe)
+     Sector::current()->get_level()->stats.badguys++;
+   
+   // start dead-script
+  if(dead_script != "") {
+    std::istringstream stream(dead_script);
+    Sector::current()->run_script(stream, "dead-script");
+  }
+}
+
+void
 BadGuy::set_state(State state)
 {
   if(this->state == state)
@@ -545,26 +556,25 @@ BadGuy::is_frozen() const
   return frozen;
 }
 
-void 
-BadGuy::ignite() 
+void
+BadGuy::ignite()
 {
   kill_fall();
 }
 
-void 
-BadGuy::extinguish() 
+void
+BadGuy::extinguish()
 {
 }
 
-bool 
-BadGuy::is_flammable() const 
+bool
+BadGuy::is_flammable() const
 {
   return true;
 }
 
-bool 
-BadGuy::is_ignited() const 
+bool
+BadGuy::is_ignited() const
 {
   return ignited;
 }
-