diff options
Diffstat (limited to 'src')
4 files changed, 6 insertions, 7 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 80ecbcfef34..36a96c44046 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2146,12 +2146,12 @@ void Creature::ForcedDespawn(uint32 timeMSToDespawn, Seconds forceRespawnTimer) } } -void Creature::DespawnOrUnsummon(uint32 msTimeToDespawn /*= 0*/, Seconds forceRespawnTimer /*= 0*/) +void Creature::DespawnOrUnsummon(Milliseconds timeToDespawn /*= 0s*/, Seconds forceRespawnTimer /*= 0s*/) { if (TempSummon* summon = ToTempSummon()) - summon->UnSummon(msTimeToDespawn); + summon->UnSummon(timeToDespawn.count()); else - ForcedDespawn(msTimeToDespawn, forceRespawnTimer); + ForcedDespawn(timeToDespawn.count(), forceRespawnTimer); } void Creature::LoadTemplateImmunities() diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index acd86bc9f7f..1ac5ea83ce0 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -247,8 +247,7 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma void RemoveCorpse(bool setSpawnTime = true, bool destroyForNearbyPlayers = true); - void DespawnOrUnsummon(uint32 msTimeToDespawn = 0, Seconds forceRespawnTime = 0s); - void DespawnOrUnsummon(Milliseconds time, Seconds forceRespawnTime = 0s) { DespawnOrUnsummon(uint32(time.count()), forceRespawnTime); } + void DespawnOrUnsummon(Milliseconds timeToDespawn = 0s, Seconds forceRespawnTime = 0s); time_t const& GetRespawnTime() const { return m_respawnTime; } time_t GetRespawnTimeEx() const; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index e78cdd74b11..c267e9bfd0f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1149,7 +1149,7 @@ public: break; case RP2_EVENT_MALGANIS_LEAVE2: if (Creature* malganis = me->FindNearestCreature(NPC_MALGANIS, 80.0f, true)) - malganis->DespawnOrUnsummon(0); + malganis->DespawnOrUnsummon(); if (Creature* bunny = me->FindNearestCreature(NPC_MALGANIS_BUNNY, 80.0f, true)) bunny->CastSpell(bunny, SPELL_SHADOWSTEP_VISUAL); break; diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index cb66cb03353..f8b6c565378 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -503,7 +503,7 @@ class go_captain_tyralius_prison : public GameObjectScript } if (Creature* prisoner = me->FindNearestCreature(NPC_ETHEREUM_PRISONER, 1.0f)) - prisoner->DespawnOrUnsummon(0); + prisoner->DespawnOrUnsummon(); return true; } |