Badguys read hitbox from .sprite file

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

diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp
index 3135c6a..a9ef465 100644 (file)
--- a/src/badguy/flyingsnowball.cpp
+++ b/src/badguy/flyingsnowball.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,13 +12,13 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
+
 #include <stdio.h>
 
 #include "flyingsnowball.hpp"
@@ -30,8 +30,8 @@ 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");
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   physic.enable_gravity(false);
 }
 
@@ -39,8 +39,8 @@ 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");
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   physic.enable_gravity(false);
 }
 
@@ -96,8 +96,12 @@ FlyingSnowBall::active_update(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")