fix collision against spikes too wide, fix paths, try to fix jumping on badguys that...

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

diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp
index 9a958d6..1fa4374 100644 (file)
--- a/src/badguy/flyingsnowball.cpp
+++ b/src/badguy/flyingsnowball.cpp
@@ -17,11 +17,11 @@
 //  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 <stdio.h>
 
-#include "flyingsnowball.h"
+#include "flyingsnowball.hpp"
 
 static const float FLYTIME = 1.0;
 static const float FLYSPEED = 100.0;
@@ -31,7 +31,7 @@ FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("flyingsnowball");
+  sprite = sprite_manager->create("images/creatures/flying_snowball/flying_snowball.sprite");
   physic.enable_gravity(false);
 }
 
@@ -40,7 +40,7 @@ FlyingSnowBall::FlyingSnowBall(float pos_x, float pos_y)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("flyingsnowball");
+  sprite = sprite_manager->create("images/creatures/flying_snowball/flying_snowball.sprite");
   physic.enable_gravity(false);
 }
 
@@ -83,7 +83,7 @@ FlyingSnowBall::collision_solid(GameObject& , const CollisionHit& hit)
 }
 
 void
-FlyingSnowBall::active_action(float elapsed_time) 
+FlyingSnowBall::active_update(float elapsed_time) 
 {
   if(timer.check()) {
     if(mode == FLY_UP) {
@@ -96,8 +96,12 @@ FlyingSnowBall::active_action(float elapsed_time)
     timer.start(FLYTIME);
   }
   movement=physic.get_movement(elapsed_time);
-  dir= Sector::current()->player->get_pos().x>get_pos().x?RIGHT:LEFT;
-  sprite->set_action(dir == LEFT ? "left" : "right");
+
+  Player* player = this->get_nearest_player();
+  if (player) {
+    dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");
+  }
 }
 
 IMPLEMENT_FACTORY(FlyingSnowBall, "flyingsnowball")