From bd56bf8afdab16383ed8ad08412a8c807f84af85 Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Sun, 22 Jan 2006 13:31:13 +0000
Subject: Merged NETWORK branch (includes BEING_OVERHAUL).

---
 src/map.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/map.cpp')

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;
-- 
cgit v1.2.3-70-g09d2