Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

[supertux.git] / src / object / firefly.cpp

diff --git a/src/object/firefly.cpp b/src/object/firefly.cpp
index c0875b5..bd4f70a 100644 (file)
--- a/src/object/firefly.cpp
+++ b/src/object/firefly.cpp
@@ -27,20 +27,39 @@
 #include "object_factory.hpp"
 #include "game_session.hpp"
 #include "sector.hpp"
+#include "random_generator.hpp"
+#include "object/sprite_particle.hpp"
 
 Firefly::Firefly(const lisp::Lisp& lisp)
-  : ringing(false)
+       : MovingSprite(lisp, "images/objects/resetpoints/default-resetpoint.sprite", LAYER_TILES, COLGROUP_TOUCHABLE), activated(false)
 {
-  lisp.get("x", bbox.p1.x);
-  lisp.get("y", bbox.p1.y);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("images/objects/firefly/firefly.sprite");
-  set_group(COLGROUP_TOUCHABLE);
+  initial_position = get_pos();
+  if( !lisp.get( "sprite", sprite_name ) ){
+    reactivate();
+    return;
+  }
+  if( sprite_name == "" ){
+    sprite_name = "images/objects/resetpoints/default-resetpoint.sprite";
+    reactivate();
+    return;
+  }
+  //Replace sprite
+  sprite = sprite_manager->create( sprite_name );
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+  reactivate();
 }
 
-Firefly::~Firefly()
+void
+Firefly::reactivate()
 {
-  delete sprite;
+  if(GameSession::current()->get_reset_point_pos() == initial_position){
+    // TODO: && GameSession::current()->get_reset_point_sectorname() ==  <sector this firefly is in>
+    // GameSession::current()->get_current_sector()->get_name() is not yet initialized.
+    // Worst case a resetpoint in a different sector at the same position as the real
+    // resetpoint the player is spawning is set to ringing, too. Until we can check the sector, too, dont set
+    // activated = true; here.
+    sprite->set_action("ringing");
+  }
 }
 
 void
@@ -49,35 +68,36 @@ Firefly::write(lisp::Writer& writer)
   writer.start_list("firefly");
   writer.write_float("x", bbox.p1.x);
   writer.write_float("y", bbox.p1.y);
-  writer.end_list("Firefly");
-}
-
-void
-Firefly::update(float )
-{
-}
-
-void
-Firefly::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_TILES);
+  writer.end_list("firefly");
 }
 
 HitResponse
 Firefly::collision(GameObject& other, const CollisionHit& )
 {
-  if(ringing)
+  if(activated)
     return ABORT_MOVE;
-  
+
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
-    ringing = true;
+    activated = true;
+// spawn some particles
+// TODO: provide convenience function in MovingSprite or MovingObject?
+          for (int i = 0; i < 5; i++) {
+            Vector ppos = bbox.get_middle();
+            float angle = systemRandom.randf(-M_PI_2, M_PI_2);
+            float velocity = systemRandom.randf(450, 900);
+            float vx = sin(angle)*velocity;
+            float vy = -cos(angle)*velocity;
+            Vector pspeed = Vector(vx, vy);
+            Vector paccel = Vector(0, 1000);
+            Sector::current()->add_object(new SpriteParticle("images/objects/particles/reset.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+          }
     // TODO play sound
     sprite->set_action("ringing");
     GameSession::current()->set_reset_point(Sector::current()->get_name(),
-        get_pos());
+        initial_position);
   }
-  
+
   return ABORT_MOVE;
 }