Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues 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

10
src/game/Object.cpp
View File

@@ -1673,16 +1673,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
SendMessageToSet(&data, true);
}
Map* WorldObject::GetMap() const
Map* WorldObject::_getMap()
{
if(m_map) return m_map;
else return const_cast<Map*>(m_map) = MapManager::Instance().GetMap(GetMapId(), this);
return m_map = MapManager::Instance().GetMap(GetMapId(), this);
}
Map* WorldObject::FindMap() const
Map* WorldObject::_findMap()
{
if(m_map) return m_map;
else return const_cast<Map*>(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
return m_map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
}
Map const* WorldObject::GetBaseMap() const

7
src/game/Object.h
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;

6
src/game/ObjectMgr.cpp
View File

@@ -5337,14 +5337,14 @@ void ObjectMgr::LoadAccessRequirements()
}
if(ar.heroicQuest)
{
{
QuestMap::iterator qReqItr = mQuestTemplates.find(ar.heroicQuest);
if(qReqItr == mQuestTemplates.end())
{
sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
ar.heroicQuest = 0;
}
}
}
}
if(ar.quest)
{