diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-12 15:36:55 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 00:06:16 +0100 |
| commit | 1e1679a1f7d9cdecb49f40f8084b46dbfd48577b (patch) | |
| tree | ef2e1aa948151f2efb2c8a999e9a71a6d4f17a4d /src/server/scripts/World | |
| parent | b7353fb92795801c2c2a52035026e9e0059fa83d (diff) | |
Core/DataStores: Port refactors from Update DBC field names to generated ones (#24999)
(cherry picked from commit c92950b3e1f6366d85d707365a8ad2caddafeecc)
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/areatrigger_scripts.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 7fc6360b3de..7bf23ca054a 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -184,12 +184,12 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript public: AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE || (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED))) { - switch (areaTrigger->ID) + switch (trigger->ID) { case AT_SHOLAZAR: player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, true); @@ -266,9 +266,9 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript _triggerTimes[AT_BREWFEST_DUROTAR] = _triggerTimes[AT_BREWFEST_DUN_MOROGH] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { - uint32 triggerId = areaTrigger->ID; + uint32 triggerId = trigger->ID; // Second trigger happened too early after first, skip for now if (GameTime::GetGameTime() - _triggerTimes[triggerId] < AREATRIGGER_TALK_COOLDOWN) return false; @@ -319,17 +319,18 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript _triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* areaTrigger) override + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { float x = 0.0f, y = 0.0f, z = 0.0f; if (!player->IsAlive()) return false; - if (GameTime::GetGameTime() - _triggerTimes[areaTrigger->ID] < SUMMON_COOLDOWN) + uint32 triggerId = trigger->ID; + if (GameTime::GetGameTime() - _triggerTimes[triggerId] < SUMMON_COOLDOWN) return false; - switch (areaTrigger->ID) + switch (triggerId) { case AT_AREA_52_EAST: x = 3044.176f; @@ -355,7 +356,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript player->SummonCreature(NPC_SPOTLIGHT, x, y, z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 5000); player->AddAura(SPELL_A52_NEURALYZER, player); - _triggerTimes[areaTrigger->ID] = GameTime::GetGameTime(); + _triggerTimes[trigger->ID] = GameTime::GetGameTime(); return false; } |