diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-03-02 23:11:49 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-06 23:58:00 +0100 |
| commit | fc456f7512b3a5f1f5fdc5b17877018892070e4d (patch) | |
| tree | 8eb961cada36a1dcc7410dc48118e73992ec24e0 /src/server/game | |
| parent | d9b7a40d432374034148368d766eb7e5a4c4fa9b (diff) | |
Core/Units: Renamed unknown unit flag (UNIT_FLAG_UNK_29 -> UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT)
(cherry picked from commit a34519bded8ae45705e7dddf6346008eea88ed39)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Unit/UnitDefines.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h index 2377fac002b..1fae85e2f80 100644 --- a/src/server/game/Entities/Unit/UnitDefines.h +++ b/src/server/game/Entities/Unit/UnitDefines.h @@ -146,7 +146,7 @@ enum UnitFlags : uint32 UNIT_FLAG_SKINNABLE = 0x04000000, UNIT_FLAG_MOUNT = 0x08000000, UNIT_FLAG_UNK_28 = 0x10000000, - UNIT_FLAG_UNK_29 = 0x20000000, // used in Feing Death spell + UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT = 0x20000000, // Prevent automatically playing emotes from parsing chat text, for example "lol" in /say, ending message with ? or !, or using /yell UNIT_FLAG_SHEATHE = 0x40000000, UNIT_FLAG_IMMUNE = 0x80000000, // Immune to damage }; diff --git a/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp b/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp index 383f5ebf7a2..eb2ec3c47d1 100644 --- a/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp +++ b/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp @@ -60,7 +60,7 @@ TC_API_EXPORT EnumText EnumUtils<UnitFlags>::ToString(UnitFlags value) case UNIT_FLAG_SKINNABLE: return { "UNIT_FLAG_SKINNABLE", "UNIT_FLAG_SKINNABLE", "" }; case UNIT_FLAG_MOUNT: return { "UNIT_FLAG_MOUNT", "UNIT_FLAG_MOUNT", "" }; case UNIT_FLAG_UNK_28: return { "UNIT_FLAG_UNK_28", "UNIT_FLAG_UNK_28", "" }; - case UNIT_FLAG_UNK_29: return { "UNIT_FLAG_UNK_29", "UNIT_FLAG_UNK_29", "used in Feing Death spell" }; + case UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT: return { "UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT", "UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT", "Prevent automatically playing emotes from parsing chat text, for example \042lol\042 in /say, ending message with ? or !, or using /yell" }; case UNIT_FLAG_SHEATHE: return { "UNIT_FLAG_SHEATHE", "UNIT_FLAG_SHEATHE", "" }; case UNIT_FLAG_IMMUNE: return { "UNIT_FLAG_IMMUNE", "UNIT_FLAG_IMMUNE", "Immune to damage" }; default: throw std::out_of_range("value"); @@ -104,7 +104,7 @@ TC_API_EXPORT UnitFlags EnumUtils<UnitFlags>::FromIndex(size_t index) case 26: return UNIT_FLAG_SKINNABLE; case 27: return UNIT_FLAG_MOUNT; case 28: return UNIT_FLAG_UNK_28; - case 29: return UNIT_FLAG_UNK_29; + case 29: return UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT; case 30: return UNIT_FLAG_SHEATHE; case 31: return UNIT_FLAG_IMMUNE; default: throw std::out_of_range("index"); @@ -145,7 +145,7 @@ TC_API_EXPORT size_t EnumUtils<UnitFlags>::ToIndex(UnitFlags value) case UNIT_FLAG_SKINNABLE: return 26; case UNIT_FLAG_MOUNT: return 27; case UNIT_FLAG_UNK_28: return 28; - case UNIT_FLAG_UNK_29: return 29; + case UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT: return 29; case UNIT_FLAG_SHEATHE: return 30; case UNIT_FLAG_IMMUNE: return 31; default: throw std::out_of_range("value"); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 3d150f4f559..fdde3126ebb 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2143,7 +2143,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo if (aurApp->GetRemoveMode()) return; - target->AddUnitFlag(UNIT_FLAG_UNK_29); + target->AddUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); target->AddUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); target->AddDynamicFlag(UNIT_DYNFLAG_DEAD); target->AddUnitState(UNIT_STATE_DIED); @@ -2153,7 +2153,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo } else { - target->RemoveUnitFlag(UNIT_FLAG_UNK_29); + target->RemoveUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); target->RemoveUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); target->RemoveDynamicFlag(UNIT_DYNFLAG_DEAD); target->ClearUnitState(UNIT_STATE_DIED); |
