diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-02-14 15:33:59 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-02-14 15:33:59 +0100 |
| commit | cc7e1bdcaed1ef1f6b4394378c99c56c8438b049 (patch) | |
| tree | 8a876d32c511f632a95bb419e12750e4b93bc95f /src/server/game/Instances/InstanceScript.h | |
| parent | 3fd1a2b78c8791576679e93ce1d43038db2212c5 (diff) | |
Core/Instances: Added back missing cases to InstanceScript::SendEncounterUnit that are supported in 3.3.5 branch
Diffstat (limited to 'src/server/game/Instances/InstanceScript.h')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 3239de145ec..618600815ae 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -53,17 +53,14 @@ enum Difficulty : uint8; enum EncounterFrameType { - ENCOUNTER_FRAME_SET_COMBAT_RES_LIMIT = 0, - ENCOUNTER_FRAME_RESET_COMBAT_RES_LIMIT = 1, - ENCOUNTER_FRAME_ENGAGE = 2, - ENCOUNTER_FRAME_DISENGAGE = 3, - ENCOUNTER_FRAME_UPDATE_PRIORITY = 4, - ENCOUNTER_FRAME_ADD_TIMER = 5, - ENCOUNTER_FRAME_ENABLE_OBJECTIVE = 6, - ENCOUNTER_FRAME_UPDATE_OBJECTIVE = 7, - ENCOUNTER_FRAME_DISABLE_OBJECTIVE = 8, - ENCOUNTER_FRAME_UNK7 = 9, // Seems to have something to do with sorting the encounter units - ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT = 10 + ENCOUNTER_FRAME_ENGAGE = 0, + ENCOUNTER_FRAME_DISENGAGE = 1, + ENCOUNTER_FRAME_UPDATE_PRIORITY = 2, + ENCOUNTER_FRAME_ADD_TIMER = 3, + ENCOUNTER_FRAME_ENABLE_OBJECTIVE = 4, + ENCOUNTER_FRAME_UPDATE_OBJECTIVE = 5, + ENCOUNTER_FRAME_DISABLE_OBJECTIVE = 6, + ENCOUNTER_FRAME_PHASE_SHIFT_CHANGED = 7 }; // EnumUtils: DESCRIBE THIS @@ -303,7 +300,7 @@ class TC_GAME_API InstanceScript : public ZoneScript void ResetAreaTriggerDone(uint32 id) { _activatedAreaTriggers.erase(id); } bool IsAreaTriggerDone(uint32 id) const { return _activatedAreaTriggers.find(id) != _activatedAreaTriggers.end(); } - void SendEncounterUnit(uint32 type, Unit* unit = nullptr, uint8 priority = 0); + void SendEncounterUnit(EncounterFrameType type, Unit const* unit, Optional<int32> param1 = {}, Optional<int32> param2 = {}); void SendEncounterStart(uint32 inCombatResCount = 0, uint32 maxInCombatResCount = 0, uint32 inCombatResChargeRecovery = 0, uint32 nextCombatResChargeTime = 0); void SendEncounterEnd(); |