josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Try to fix compile in linux.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-20 19:57:01 -05:00
parent b57429c44c
commit df26c17a11
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Object.cpp
+4 -6
View File
@@ -1554,16 +1554,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
SendMessageToSet(&data, true); SendMessageToSet(&data, true);
} }
Map* WorldObject::GetMap() const Map* WorldObject::_getMap()
{ {
if(m_map) return m_map; return m_map = MapManager::Instance().GetMap(GetMapId(), this);
else return const_cast<Map*>(m_map) = MapManager::Instance().GetMap(GetMapId(), this);
} }
Map* WorldObject::FindMap() const Map* WorldObject::_findMap()
{ {
if(m_map) return m_map; return m_map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
else return const_cast<Map*>(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
} }
Map const* WorldObject::GetBaseMap() const Map const* WorldObject::GetBaseMap() const
src/game/Object.h
+5 -2
View File
@@ -480,8 +480,8 @@ class TRINITY_DLL_SPEC WorldObject : public Object
// Low Level Packets // Low Level Packets
void SendPlaySound(uint32 Sound, bool OnlySelf); void SendPlaySound(uint32 Sound, bool OnlySelf);
Map * GetMap() const; Map * GetMap() const { return m_map ? m_map : const_cast<WorldObject*>(this)->_getMap(); }
Map * FindMap() const; Map * FindMap() const { return m_map ? m_map : const_cast<WorldObject*>(this)->_findMap(); }
Map const* GetBaseMap() const; Map const* GetBaseMap() const;
Creature* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime); Creature* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime);
GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime); GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime);
@@ -504,6 +504,9 @@ class TRINITY_DLL_SPEC WorldObject : public Object
uint32 m_InstanceId; uint32 m_InstanceId;
Map *m_map; Map *m_map;
Map* _getMap();
Map* _findMap();
float m_positionX; float m_positionX;
float m_positionY; float m_positionY;
float m_positionZ; float m_positionZ;