diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-09-09 18:36:02 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-09-10 17:47:34 +0200 |
| commit | 1fd797fca458c0915da88082c0a0ad3cb313307a (patch) | |
| tree | 23252c949b597a3a78da8253f8845a0cdbb3cbad /src/server/game/Instances | |
| parent | fcfb5763ea137af601a7c76923999d58cb19e5b0 (diff) | |
Core/Misc: Reduce differences between branches
(cherry picked from commit 36a90f7098c27279521b6668067bb2e0bbe628de)
(cherry picked from commit 005636003410b9223c9083f6729557a58858efbd)
(cherry picked from commit 869a8644e55d4d1db724df7f20d59ed26fce53f4)
(cherry picked from commit 94e85c34d3187de243984e46e1cc6d9ef3361529)
(cherry picked from commit f27cc655880ebe2ce38c133a22592b6b7730a759)
(cherry picked from commit 42f3f91ad400b9e129213eb06df6256bb55079be)
(cherry picked from commit 1180fbf531eb6e4c359763d23c3ec65349b94944)
(cherry picked from commit 629694cbadad171534304004dab4439553369c17)
(cherry picked from commit 506e7913f8ece7ca2854cf9e6613af8a7d69d895)
(cherry picked from commit e7c7158db0da55892983629e852ac6faf0f4f630)
(cherry picked from commit a369594d61c688127eff7c04e2a691400416b18d)
(cherry picked from commit cc5450c4a08d228d3b7cd31e3c2a233aa8bb8b48)
(cherry picked from commit d3e508254baeca8404b11b700a5b97bdd8b5b072)
(cherry picked from commit dcd915c9b9f4490fd05fe8854c3e23cd3778f530)
(cherry picked from commit b95d148dbed15b2932cd618dbf2c74479fde30f0)
(cherry picked from commit ac81411db461184a9d20cb43b44eca414df5e81e)
(cherry picked from commit d8ce0c88307fe35f2f10270c7cf64d0e0763a8dc)
(cherry picked from commit a2b1cf66ca00ae22bd19abd49051537179d144b3)
(cherry picked from commit 953f0939203501f0182cb10f9c92246df2bee343)
brc
Diffstat (limited to 'src/server/game/Instances')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 3eba144a4aa..0423dc2eca0 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -57,14 +57,14 @@ enum EncounterCreditType : uint8; enum EncounterFrameType { - 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 + 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 |