diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2021-09-15 01:04:03 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-15 23:03:26 +0100 |
| commit | c4906ce60be52c9a678287672a6461c3068beea3 (patch) | |
| tree | 6a34ae52e80e49aa3048c6b6684c4ae0fea508b3 /src/server/game/Entities/Unit | |
| parent | 6a5f3835f3588a1f1d6fa406f4b384869770b34a (diff) | |
Core/Misc: Rename UNIT_FLAG_NOT_SELECTABLE to UNIT_FLAG_UNINTERACTIBLE (#26913)
(cherry picked from commit c4741a131a0a28b69c228d3637beab7090e5f1e3)
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/UnitDefines.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 792db13d390..010b316c45b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7813,7 +7813,7 @@ bool Unit::isTargetableForAttack(bool checkFakeDeath) const if (!IsAlive()) return false; - if (HasUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))) + if (HasUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE))) return false; if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->IsGameMaster()) diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h index 1fae85e2f80..2cfb8b0fa9a 100644 --- a/src/server/game/Entities/Unit/UnitDefines.h +++ b/src/server/game/Entities/Unit/UnitDefines.h @@ -142,7 +142,7 @@ enum UnitFlags : uint32 UNIT_FLAG_CONFUSED = 0x00400000, UNIT_FLAG_FLEEING = 0x00800000, UNIT_FLAG_POSSESSED = 0x01000000, // under direct client control by a player (possess or vehicle) - UNIT_FLAG_NOT_SELECTABLE = 0x02000000, + UNIT_FLAG_UNINTERACTIBLE = 0x02000000, UNIT_FLAG_SKINNABLE = 0x04000000, UNIT_FLAG_MOUNT = 0x08000000, UNIT_FLAG_UNK_28 = 0x10000000, diff --git a/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp b/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp index eb2ec3c47d1..aef754fb5e4 100644 --- a/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp +++ b/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp @@ -56,7 +56,7 @@ TC_API_EXPORT EnumText EnumUtils<UnitFlags>::ToString(UnitFlags value) case UNIT_FLAG_CONFUSED: return { "UNIT_FLAG_CONFUSED", "UNIT_FLAG_CONFUSED", "" }; case UNIT_FLAG_FLEEING: return { "UNIT_FLAG_FLEEING", "UNIT_FLAG_FLEEING", "" }; case UNIT_FLAG_POSSESSED: return { "UNIT_FLAG_POSSESSED", "UNIT_FLAG_POSSESSED", "under direct client control by a player (possess or vehicle)" }; - case UNIT_FLAG_NOT_SELECTABLE: return { "UNIT_FLAG_NOT_SELECTABLE", "UNIT_FLAG_NOT_SELECTABLE", "" }; + case UNIT_FLAG_UNINTERACTIBLE: return { "UNIT_FLAG_UNINTERACTIBLE", "UNIT_FLAG_UNINTERACTIBLE", "" }; 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", "" }; @@ -100,7 +100,7 @@ TC_API_EXPORT UnitFlags EnumUtils<UnitFlags>::FromIndex(size_t index) case 22: return UNIT_FLAG_CONFUSED; case 23: return UNIT_FLAG_FLEEING; case 24: return UNIT_FLAG_POSSESSED; - case 25: return UNIT_FLAG_NOT_SELECTABLE; + case 25: return UNIT_FLAG_UNINTERACTIBLE; case 26: return UNIT_FLAG_SKINNABLE; case 27: return UNIT_FLAG_MOUNT; case 28: return UNIT_FLAG_UNK_28; @@ -141,7 +141,7 @@ TC_API_EXPORT size_t EnumUtils<UnitFlags>::ToIndex(UnitFlags value) case UNIT_FLAG_CONFUSED: return 22; case UNIT_FLAG_FLEEING: return 23; case UNIT_FLAG_POSSESSED: return 24; - case UNIT_FLAG_NOT_SELECTABLE: return 25; + case UNIT_FLAG_UNINTERACTIBLE: return 25; case UNIT_FLAG_SKINNABLE: return 26; case UNIT_FLAG_MOUNT: return 27; case UNIT_FLAG_UNK_28: return 28; |