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

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-20 20:31:20 -05:00
parent fc7e1db9fb df26c17a11
commit 0c56b79e96
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Object.h
+5 -2
View File
@@ -515,8 +515,8 @@ class TRINITY_DLL_SPEC WorldObject : public Object
// Low Level Packets
void SendPlaySound(uint32 Sound, bool OnlySelf);
Map * GetMap() const;
Map * FindMap() const;
Map * GetMap() const { return m_map ? m_map : const_cast<WorldObject*>(this)->_getMap(); }
Map * FindMap() const { return m_map ? m_map : const_cast<WorldObject*>(this)->_findMap(); }
Map const* GetBaseMap() const;
TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime);
Vehicle* SummonVehicle(uint32 entry, float x, float y, float z, float ang);
@@ -541,6 +541,9 @@ class TRINITY_DLL_SPEC WorldObject : public Object
uint32 m_phaseMask; // in area phase state
Map *m_map;
Map* _getMap();
Map* _findMap();
float m_positionX;
float m_positionY;
float m_positionZ;