diff options
| author | HelloKitty <andrew.blakely@ymail.com> | 2021-05-11 05:33:05 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 12:33:05 +0200 | 
| commit | e33c4b8f7f18c89fec3d95531fdccad526c12c10 (patch) | |
| tree | a24f2a219c2264799532fd709628995c0f672a6b /src/server/scripts | |
| parent | fb88a1409ff60343edb0c539d406a961724fcc4e (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
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 10 | 
2 files changed, 10 insertions, 10 deletions
| diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 69b749b1f11..ebf0f260523 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -540,7 +540,7 @@ struct boss_the_lich_king : public BossAI          Cell::VisitGridObjects(me, worker, 333.0f);          // Reset any light override -        me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, 0, 5000); +        me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, 0, 5s);          if (!ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))              me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING_LK, TirionSpawn, TEMPSUMMON_MANUAL_DESPAWN); @@ -554,7 +554,7 @@ struct boss_the_lich_king : public BossAI          me->GetMotionMaster()->MoveFall();          if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f))              frostmourne->DespawnOrUnsummon(); -        me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, LIGHT_FOG, 5000); +        me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, LIGHT_FOG, 5s);          me->GetMap()->SetZoneWeather(AREA_ICECROWN_CITADEL, WEATHER_STATE_FOG, 0.0f);          if (Is25ManRaid()) @@ -627,7 +627,7 @@ struct boss_the_lich_king : public BossAI                  me->GetMap()->SetZoneMusic(AREA_ICECROWN_CITADEL, MUSIC_FINAL);                  break;              case ACTION_RESTORE_LIGHT: -                me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, 0, 5000); +                me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, 0, 5s);                  break;              case ACTION_BREAK_FROSTMOURNE:                  me->CastSpell(nullptr, SPELL_SUMMON_BROKEN_FROSTMOURNE, TRIGGERED_IGNORE_CAST_IN_PROGRESS); @@ -765,7 +765,7 @@ struct boss_the_lich_king : public BossAI              {                  summon->CastSpell(nullptr, SPELL_BROKEN_FROSTMOURNE, true); -                me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, LIGHT_SOULSTORM, 10000); +                me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, LIGHT_SOULSTORM, 10s);                  me->GetMap()->SetZoneWeather(AREA_ICECROWN_CITADEL, WEATHER_STATE_BLACKSNOW, 0.5f);                  events.ScheduleEvent(EVENT_OUTRO_SOUL_BARRAGE, 5s, 0, PHASE_OUTRO); @@ -817,7 +817,7 @@ struct boss_the_lich_king : public BossAI          if (spellInfo->Id == REMORSELESS_WINTER_1 || spellInfo->Id == REMORSELESS_WINTER_2)          { -            me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, LIGHT_SNOWSTORM, 5000); +            me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_DEFAULT, LIGHT_SNOWSTORM, 5s);              me->GetMap()->SetZoneWeather(AREA_ICECROWN_CITADEL, WEATHER_STATE_LIGHT_SNOW, 0.5f);              summons.DespawnEntry(NPC_SHADOW_TRAP);          } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 464a75aa936..ef3640f166d 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -582,7 +582,7 @@ public:          {              instance->SetBossState(DATA_MALYGOS_EVENT, FAIL); -            me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, 0, 1*IN_MILLISECONDS); +            me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, 0, 1s);              if (!summons.empty())              { @@ -700,7 +700,7 @@ public:                      me->SetDisableGravity(true);                      if (Creature* alexstraszaBunny = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ALEXSTRASZA_BUNNY_GUID)))                          me->SetFacingToObject(alexstraszaBunny); -                    me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_ARCANE_RUNES, 5 * IN_MILLISECONDS); +                    me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_ARCANE_RUNES, 5s);                      events.ScheduleEvent(EVENT_FLY_OUT_OF_PLATFORM, 18s, 0, PHASE_TWO);                      break;                  case POINT_SURGE_OF_POWER_P_TWO: @@ -712,7 +712,7 @@ public:                      }                      break;                  case POINT_DESTROY_PLATFORM_P_TWO: -                    me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_OBSCURE_SPACE, 1 * IN_MILLISECONDS); +                    me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_OBSCURE_SPACE, 1s);                      DoCast(me, SPELL_DESTROY_PLATFORM_CHANNEL);                      events.ScheduleEvent(EVENT_MOVE_TO_P_THREE_POINT, 11s, 0, PHASE_TWO);                      break; @@ -908,7 +908,7 @@ public:                          }                          break;                      case EVENT_LIGHT_DIMENSION_CHANGE: -                        me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_CHANGE_DIMENSIONS, 2 * IN_MILLISECONDS); +                        me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_CHANGE_DIMENSIONS, 2s);                          break;                      case EVENT_DELAY_MOVE_TO_DESTROY_P:                          me->GetMotionMaster()->MovePoint(POINT_DESTROY_PLATFORM_P_TWO, MalygosPositions[0]); @@ -918,7 +918,7 @@ public:                          me->GetMotionMaster()->MovePoint(POINT_IDLE_P_THREE, MalygosPositions[4]);                          break;                      case EVENT_START_P_THREE: -                        me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_OBSCURE_ARCANE_RUNES, 1 * IN_MILLISECONDS); +                        me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_DEFAULT, LIGHT_OBSCURE_ARCANE_RUNES, 1s);                          DoCast(me, SPELL_CLEAR_ALL_DEBUFFS);                          DoCast(me, SPELL_IMMUNE_CURSES);                          me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); | 
