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
@@ -158,7 +158,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
if (mInstance)
{
// check if this instance has a reset time and send it to player if so
Difficulty diff = GetPlayer()->GetDifficulty(mEntry->IsRaid());
Difficulty diff = newMap->GetDifficulty();
if (MapDifficulty const* mapDiff = GetMapDifficultyData(mEntry->MapID, diff))
{
if (mapDiff->resetTime)
+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;
+3 -3
View File
@@ -35,7 +35,7 @@ class AreaBoundary;
class Creature;
class GameObject;
struct InstanceSpawnGroupInfo;
class Map;
class InstanceMap;
class ModuleReference;
class Player;
class Unit;
@@ -149,11 +149,11 @@ typedef std::map<uint32 /*entry*/, uint32 /*type*/> ObjectInfoMap;
class TC_GAME_API InstanceScript : public ZoneScript
{
public:
explicit InstanceScript(Map* map);
explicit InstanceScript(InstanceMap* map);
virtual ~InstanceScript() { }
Map* instance;
InstanceMap* instance;
// On creation, NOT load.
// PLEASE INITIALIZE FIELDS IN THE CONSTRUCTOR INSTEAD !!!