diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
| commit | bd56bf8afdab16383ed8ad08412a8c807f84af85 (patch) | |
| tree | 0e963ada63bcbe3c50dd77986aaa15b9ba49816a /src/map.cpp | |
| parent | 5359640b6f271af31f6423df9d661433eff89a3e (diff) | |
| download | mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.gz mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.bz2 mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.xz mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.zip | |
Merged NETWORK branch (includes BEING_OVERHAUL).
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; |