X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fangrystone.cpp;h=a44e8363e494e89692fcfec53ed5e53dc3abecd7;hb=b51a3e05e9212c00c3bf7d00c6c2bf33fe8e2970;hp=a3eb781221063432e32a7cbc731e4b37af4ae292;hpb=b158cdbc7139bcc35fd4c37a5cf640bf9f744998;p=supertux.git diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp index a3eb78122..a44e8363e 100644 --- a/src/badguy/angrystone.cpp +++ b/src/badguy/angrystone.cpp @@ -1,5 +1,5 @@ -// $Id: angrystone.cpp 2979 2006-01-10 00:00:04Z matzebraun $ -// +// $Id$ +// // AngryStone - A spiked block that charges towards the player // Copyright (C) 2006 Christoph Sommer // @@ -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 @@ -32,8 +32,8 @@ 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("images/creatures/angrystone/angrystone.sprite"); + bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height()); state = IDLE; } @@ -95,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();