diff options
Diffstat (limited to 'src/map.cpp')
-rw-r--r-- | src/map.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map.cpp b/src/map.cpp index 5150bcff..248c07d0 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -26,11 +26,12 @@ #include <algorithm> #include <queue> -#include "tileset.h" -#include "being.h" +#include "beingmanager.h" #include "graphics.h" -#include "resources/image.h" #include "sprite.h" +#include "tileset.h" + +#include "resources/image.h" MetaTile::MetaTile(): whichList(0) @@ -217,8 +218,9 @@ Map::getWalk(int x, int y) } // Check for collision with a being - std::list<Being*>::iterator i = beings.begin(); - for (i = beings.begin(); i != beings.end(); i++) { + Beings *beings = beingManager->getAll(); + Beings::iterator i; + for (i = beings->begin(); i != beings->end(); i++) { // job 45 is a portal, they don't collide if ((*i)->x == x && (*i)->y == y && (*i)->job != 45) { return false; |