diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index 42b9b0bc9..7f351f209 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -184,7 +184,7 @@ void InstanceResetScheduler::LoadResetTimes() // schedule the reset times for(InstResetTimeMapDiffType::iterator itr = instResetTime.begin(); itr != instResetTime.end(); ++itr) if(itr->second.second > now) - ScheduleReset(true, itr->second.second, InstanceResetEvent(RESET_EVENT_DENGEON, PAIR32_LOPART(itr->second.first),Difficulty(PAIR32_HIPART(itr->second.first)),itr->first)); + ScheduleReset(true, itr->second.second, InstanceResetEvent(RESET_EVENT_DUNGEON, PAIR32_LOPART(itr->second.first),Difficulty(PAIR32_HIPART(itr->second.first)),itr->first)); } // load the global respawn times for raid/heroic instances @@ -387,7 +387,7 @@ InstanceSave* InstanceSaveManager::AddInstanceSave(uint32 mapId, uint32 instance { resetTime = time(NULL) + 2 * HOUR; // normally this will be removed soon after in InstanceMap::Add, prevent error - m_Scheduler.ScheduleReset(true, resetTime, InstanceResetEvent(RESET_EVENT_DENGEON, mapId, difficulty, instanceId)); + m_Scheduler.ScheduleReset(true, resetTime, InstanceResetEvent(RESET_EVENT_DUNGEON, mapId, difficulty, instanceId)); } } diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index b491238e1..fb6ee1d74 100644 --- a/src/game/InstanceSaveMgr.h +++ b/src/game/InstanceSaveMgr.h @@ -122,7 +122,7 @@ class InstanceSave enum ResetEventType { - RESET_EVENT_DENGEON = 0, // no fixed reset time + RESET_EVENT_DUNGEON = 0, // no fixed reset time RESET_EVENT_INFORM_1 = 1, // raid/heroic warnings RESET_EVENT_INFORM_2 = 2, RESET_EVENT_INFORM_3 = 3, @@ -140,7 +140,7 @@ struct InstanceResetEvent uint16 mapid; uint32 instanceId; - InstanceResetEvent() : type(RESET_EVENT_DENGEON), difficulty(DUNGEON_DIFFICULTY_NORMAL), mapid(0), instanceId(0) {} + InstanceResetEvent() : type(RESET_EVENT_DUNGEON), difficulty(DUNGEON_DIFFICULTY_NORMAL), mapid(0), instanceId(0) {} InstanceResetEvent(ResetEventType t, uint32 _mapid, Difficulty d, uint32 _instanceid) : type(t), difficulty(d), mapid(_mapid), instanceId(_instanceid) {} bool operator == (const InstanceResetEvent& e) { return e.instanceId == instanceId; } diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 8f4454778..8147bad21 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -1968,7 +1968,7 @@ void InstanceMap::SetResetSchedule(bool on) // the reset time is only scheduled when there are no payers inside // it is assumed that the reset time will rarely (if ever) change while the reset is scheduled if(IsDungeon() && !HavePlayers() && !IsRaidOrHeroicDungeon()) - sInstanceSaveMgr.GetScheduler().ScheduleReset(on, GetInstanceSave()->GetResetTime(), InstanceResetEvent(RESET_EVENT_DENGEON, GetId(), Difficulty(GetSpawnMode()), GetInstanceId())); + sInstanceSaveMgr.GetScheduler().ScheduleReset(on, GetInstanceSave()->GetResetTime(), InstanceResetEvent(RESET_EVENT_DUNGEON, GetId(), Difficulty(GetSpawnMode()), GetInstanceId())); } /* ******* Battleground Instance Maps ******* */