From 351ffb7db745ad9765a7bc3cc89cbba5c949ff11 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 28 Feb 2010 10:29:35 +0000 Subject: [PATCH] Icecrusher: Use Sector::get_nearest_player(). The icecrusher's own implementation has been removed. SVN-Revision: 6445 --- src/object/icecrusher.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/object/icecrusher.cpp b/src/object/icecrusher.cpp index d97b4b0f9..199ec51dc 100644 --- a/src/object/icecrusher.cpp +++ b/src/object/icecrusher.cpp @@ -166,25 +166,10 @@ IceCrusher::update(float elapsed_time) } } -Player* -IceCrusher::get_nearest_player() -{ - // FIXME: does not really return nearest player - - std::vector players = Sector::current()->get_players(); - for (std::vector::iterator playerIter = players.begin(); playerIter != players.end(); ++playerIter) { - Player* player = *playerIter; - if (player->is_dying() || player->is_dead()) continue; - return player; - } - - return 0; -} - bool IceCrusher::found_victim() { - Player* player = this->get_nearest_player(); + Player* player = Sector::current()->get_nearest_player (this->get_pos ()); if (!player) return false; const Rectf& player_bbox = player->get_bbox(); -- 2.11.0