projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e850a10
)
badbuy/badbuy.cpp: Use Sector::get_nearest_player().
author
Florian Forster
<supertux@octo.it>
Sun, 28 Feb 2010 11:08:43 +0000
(11:08 +0000)
committer
Florian Forster
<supertux@octo.it>
Sun, 28 Feb 2010 11:08:43 +0000
(11:08 +0000)
SVN-Revision: 6451
src/badguy/badguy.cpp
patch
|
blob
|
history
diff --git
a/src/badguy/badguy.cpp
b/src/badguy/badguy.cpp
index
0b51f71
..
5ee5b99
100644
(file)
--- a/
src/badguy/badguy.cpp
+++ b/
src/badguy/badguy.cpp
@@
-492,16
+492,7
@@
BadGuy::might_fall(int height)
Player*
BadGuy::get_nearest_player()
{
Player*
BadGuy::get_nearest_player()
{
- // FIXME: does not really return nearest player
-
- std::vector<Player*> players = Sector::current()->get_players();
- for (std::vector<Player*>::iterator playerIter = players.begin(); playerIter != players.end(); ++playerIter) {
- Player* player = *playerIter;
- if (player->is_dying() || player->is_dead()) continue;
- return player;
- }
-
- return 0;
+ return Sector::current()->get_nearest_player (this->get_bbox ());
}
void
}
void