Core/Instances: merged some master branch commits in preparation for merging the upcomming instance save rewrite

This commit is contained in:
Ovahlord committed 2018-07-28 02:00:24 +02:00
1 parent 92ef398f56
commit 78ed8acdcc
73 files changed
+74 -98

No files matched your search

+1 -1
View File
@@ -48,7 +48,7 @@ BossBoundaryData::~BossBoundaryData()
delete it->Boundary;
}
InstanceScript::InstanceScript(Map* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetSpawnGroupsForInstance(map->GetId()))
InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetSpawnGroupsForInstance(map->GetId()))
{
#ifdef TRINITY_API_USE_DYNAMIC_LINKING
uint32 scriptId = sObjectMgr->GetInstanceTemplate(map->GetId())->ScriptId;