Changeset 61

Timestamp:

11/19/08 13:30:29 (17 years ago)

Author:

yumileroy

Message:

[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.

Original author: w12x
Date: 2008-10-19 11:07:10-05:00

Location:

trunk/src/game

Files:

• Map.cpp (modified) (1 diff)
• Map.h (modified) (1 diff)
• Unit.cpp (modified) (1 diff)
• Unit.h (modified) (1 diff)

trunk/src/game/Map.cpp

@@ -1561 +1561 @@
 }
 
+Creature * Map::GetCreatureInMap(uint64 guid)
+{
+    Creature * obj = HashMapHolder<Creature>::Find(guid);
+    if(obj && obj->GetInstanceId() != GetInstanceId()) obj = NULL;
+    return obj;
+}
+
+GameObject * Map::GetGameObjectInMap(uint64 guid)
+{
+    GameObject * obj = HashMapHolder<GameObject>::Find(guid);
+    if(obj && obj->GetInstanceId() != GetInstanceId()) obj = NULL;
+    return obj;
+}
+
 void InstanceMap::CreateInstanceData(bool load)
 {

trunk/src/game/Map.h

@@ -235 +235 @@
         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);

trunk/src/game/Unit.cpp

@@ -9397 +9397 @@
 }
 
-template<class T> T*
-Unit::GetObjectInWorld(uint64 guid, T* /*fake*/)
-{
-    return ObjectAccessor::GetObjectInWorld(uint64 guid, T* /*fake*/);
-}
-
 bool Unit::isVisibleForInState( Player const* u, bool inVisibleList ) const
 {

trunk/src/game/Unit.h

@@ -1219 +1219 @@
         void removeFollower(FollowerReference* /*pRef*/ ) { /* nothing to do yet */ }
         static Unit* GetUnit(WorldObject& object, uint64 guid);
-        template<class T> static T* GetObjectInWorld(uint64 guid, T* /*fake*/);
 
         MotionMaster* GetMotionMaster() { return &i_motionMaster; }