diff options
| author | HelloKitty <andrew.blakely@ymail.com> | 2021-05-11 05:33:05 -0500 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-09 14:56:04 +0100 |
| commit | a67bb1f5756f84bae1ccafc3c785b76b574f1aba (patch) | |
| tree | 52bc9885fbc3ccd24bf9f0f99f38da61195b848a /src/server/game | |
| parent | 4dbacb69852e3324ddd9abb55a44d93b00679e36 (diff) | |
Core/Map: Added Map::SetZoneOverrideLight std::chrono overload (#26486)
* Core/Map: Added Map::SetZoneOverrideLight std::chrono overload
* Scripts: Replace Map::SetZoneOverrideLight usages with new std::chrono overload
* Core/Map: Remove non-chrono Map::SetZoneOverrideLight overload
(cherry picked from commit e33c4b8f7f18c89fec3d95531fdccad526c12c10)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e55f545deab..f13d7a1f815 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2497,7 +2497,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (WorldObject* obj = GetBaseObject()) { - obj->GetMap()->SetZoneOverrideLight(e.action.overrideLight.zoneId, e.action.overrideLight.areaLightId, e.action.overrideLight.overrideLightId, e.action.overrideLight.transitionMilliseconds); + obj->GetMap()->SetZoneOverrideLight(e.action.overrideLight.zoneId, e.action.overrideLight.areaLightId, e.action.overrideLight.overrideLightId, Milliseconds(e.action.overrideLight.transitionMilliseconds)); TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_OVERRIDE_LIGHT: %s sets zone override light (zoneId: %u, areaLightId: %u, overrideLightId: %u, transitionMilliseconds: %u)", obj->GetGUID().ToString().c_str(), e.action.overrideLight.zoneId, e.action.overrideLight.areaLightId, e.action.overrideLight.overrideLightId, e.action.overrideLight.transitionMilliseconds); } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 5836f70fb72..a0bc1b4cb33 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -5015,7 +5015,7 @@ void Map::SetZoneWeather(uint32 zoneId, WeatherState weatherId, float intensity) } } -void Map::SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrideLightId, uint32 transitionMilliseconds) +void Map::SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrideLightId, Milliseconds transitionTime) { ZoneDynamicInfo& info = _zoneDynamicInfo[zoneId]; // client can support only one override for each light (zone independent) @@ -5030,7 +5030,7 @@ void Map::SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrid ZoneDynamicInfo::LightOverride& lightOverride = info.LightOverrides.emplace_back(); lightOverride.AreaLightId = areaLightId; lightOverride.OverrideLightId = overrideLightId; - lightOverride.TransitionMilliseconds = transitionMilliseconds; + lightOverride.TransitionMilliseconds = static_cast<uint32>(transitionTime.count()); } Map::PlayerList const& players = GetPlayers(); @@ -5039,7 +5039,7 @@ void Map::SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrid WorldPackets::Misc::OverrideLight overrideLight; overrideLight.AreaLightID = areaLightId; overrideLight.OverrideLightID = overrideLightId; - overrideLight.TransitionMilliseconds = transitionMilliseconds; + overrideLight.TransitionMilliseconds = static_cast<uint32>(transitionTime.count()); overrideLight.Write(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 47848abe696..69da248676e 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -591,7 +591,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> Weather* GetOrGenerateZoneDefaultWeather(uint32 zoneId); WeatherState GetZoneWeather(uint32 zoneId) const; void SetZoneWeather(uint32 zoneId, WeatherState weatherId, float intensity); - void SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrideLightId, uint32 transitionMilliseconds); + void SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrideLightId, Milliseconds transitionTime); void UpdateAreaDependentAuras(); |
