diff options
| author | ModoX <moardox@gmail.com> | 2024-12-29 00:17:07 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-12-29 12:17:25 +0100 |
| commit | 74f9ad8c2e3efa6b18ecb0f7df6a6e37a85d3c3f (patch) | |
| tree | 2c4b208e5aebf6f37ef271ff6ee1e471238841a2 /src/server/scripts/EasternKingdoms | |
| parent | 1f81c961f24337abdc8de25bd23d9834d0c7392b (diff) | |
Core/AI: Remove default arguments for inter-script communication
(cherry picked from commit 6b96facee3389f79e579e8a325440051891fa27e)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 14 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp | 11 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 9c2969e0704..ccd5dbe4b7d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -73,6 +73,11 @@ enum UnworthyInitiatePhase PHASE_ATTACKING, }; +enum UnworthyInitiateData +{ + DATA_PRISONER_GUID = 0 +}; + uint32 acherus_soul_prison[12] = { 191577, @@ -191,7 +196,7 @@ public: { if (Creature* anchor = me->FindNearestCreature(29521, 30)) { - anchor->AI()->SetGUID(me->GetGUID()); + anchor->AI()->SetGUID(me->GetGUID(), DATA_PRISONER_GUID); anchor->CastSpell(me, SPELL_SOUL_PRISON_CHAIN, true); anchorGUID = anchor->GetGUID(); } @@ -312,8 +317,11 @@ public: ObjectGuid prisonerGUID; - void SetGUID(ObjectGuid const& guid, int32 /*id*/) override + void SetGUID(ObjectGuid const& guid, int32 id) override { + if (id != DATA_PRISONER_GUID) + return; + prisonerGUID = guid; } @@ -337,7 +345,7 @@ class go_acherus_soul_prison : public GameObjectScript { if (Creature* anchor = me->FindNearestCreature(29521, 15)) { - ObjectGuid prisonerGUID = anchor->AI()->GetGUID(); + ObjectGuid prisonerGUID = anchor->AI()->GetGUID(DATA_PRISONER_GUID); if (!prisonerGUID.IsEmpty()) if (Creature* prisoner = ObjectAccessor::GetCreature(*player, prisonerGUID)) ENSURE_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 108ce771e0b..9dce483983b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -88,12 +88,13 @@ enum Action ACTION_REVIVE = 1 }; -enum Misc +enum MandokirMisc { POINT_START_REVIVE = 1, DATA_OHGANOT_SO_FAST = 5762, + DATA_REVIVE_GUID = 0, }; enum SummonGroups @@ -198,7 +199,7 @@ struct boss_mandokir : public BossAI { if (Creature* chainedSpirit = ObjectAccessor::GetCreature(*me, (*itr)->GetGUID())) { - chainedSpirit->AI()->SetGUID(_reviveGUID); + chainedSpirit->AI()->SetGUID(_reviveGUID, DATA_REVIVE_GUID); chainedSpirit->AI()->DoAction(ACTION_REVIVE); _reviveGUID.Clear(); } @@ -219,7 +220,7 @@ struct boss_mandokir : public BossAI return 0; } - void SetGUID(ObjectGuid const& guid, int32 /*type = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*type*/) override { _reviveGUID = guid; } @@ -343,7 +344,7 @@ struct npc_chained_spirit : public ScriptedAI _revivePlayerGUID.Clear(); } - void SetGUID(ObjectGuid const& guid, int32 /*type = 0 */) override + void SetGUID(ObjectGuid const& guid, int32 /*type*/) override { _revivePlayerGUID = guid; } @@ -383,7 +384,7 @@ struct npc_chained_spirit : public ScriptedAI if (Creature* mandokir = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_MANDOKIR))) { - mandokir->GetAI()->SetGUID(target->GetGUID()); + mandokir->GetAI()->SetGUID(target->GetGUID(), DATA_REVIVE_GUID); mandokir->GetAI()->DoAction(ACTION_START_REVIVE); } |