[svn] Finally really fixed compile. Also, removed Unit::GetObjectInWorld(), use Map::GetCreatureInMap() and Map::GetGameObjectInMap() instead. This is to prevent creature-creature interaction on different maps, which would make the later multithreading of maps impossible.

--HG--
branch : trunk

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game/Map.h b/src/game/Map.h
index 8da3939a914..11ea7e2be61 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -234,6 +234,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
         void resetMarkedCells() { marked_cells.reset(); }
         bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); }
         void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
+        Creature* GetCreatureInMap(uint64 guid);
+        GameObject* GetGameObjectInMap(uint64 guid);
     private:
         void LoadVMap(int pX, int pY);
         void LoadMap(uint32 mapid, uint32 instanceid, int x,int y);