Massive copyright update. I'm sorry if I'm crediting Matze for something he didn...

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

diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp
index ee4d26c..2f9dc8a 100644 (file)
--- a/src/badguy/angrystone.cpp
+++ b/src/badguy/angrystone.cpp
@@ -1,7 +1,7 @@
-//  $Id: angrystone.cpp 2979 2006-01-10 00:00:04Z matzebraun $
-// 
-//  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  $Id$
+//
+//  AngryStone - A spiked block that charges towards the player
+//  Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +12,7 @@
 //  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
@@ -33,7 +33,7 @@ AngryStone::AngryStone(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(87.8, 87.8); // sprite is (88px, 88px)
-  sprite = sprite_manager->create("angrystone");
+  sprite = sprite_manager->create("images/creatures/angrystone/angrystone.sprite");
   state = IDLE;
 }
 
@@ -73,8 +73,14 @@ AngryStone::collision_solid(GameObject& , const CollisionHit& hit)
   return CONTINUE;
 }
 
+void
+AngryStone::kill_fall()
+{
+  //prevents AngryStone from getting killed by other enemies or the player
+}
+
 HitResponse
-AngryStone::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
+AngryStone::collision_badguy(BadGuy& badguy, const CollisionHit& )
 {
   if (state == ATTACKING) {
     badguy.kill_fall();
@@ -89,7 +95,7 @@ AngryStone::active_update(float elapsed_time) {
   BadGuy::active_update(elapsed_time);
 
   if (state == IDLE) {
-    MovingObject* player = Sector::current()->player;
+    MovingObject* player = this->get_nearest_player();
     MovingObject* badguy = this;
     const Vector playerPos = player->get_pos();
     const Vector badguyPos = badguy->get_pos();