diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2021-07-30 10:36:38 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-11 21:20:04 +0100 |
| commit | 53d19b09f4de7c092747663ae7e1a01c0df553bf (patch) | |
| tree | 41efcfbadf26ec69e5ee4077b3514134a9176442 /src/server/game/Entities/Unit | |
| parent | 5afa32e9a7e944d5fbee620c31bf6e2939ec7c5d (diff) | |
Core/Creature: rename CREATURE_FLAG_EXTRA_IGNORE_COMBAT into CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT (#26762)
Co-authored-by: offl <offl@users.noreply.github.com>
(cherry picked from commit 06b554c36e8f196667e0a72820b37b9dc25bdde0)
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/Unit.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index a9adf79db7d..de3012895cd 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -397,7 +397,7 @@ Unit::Unit(bool isWorldObject) : _oldFactionId = 0; _isWalkingBeforeCharm = false; _instantCast = false; - _isIgnoringCombat = false; + _isCombatDisallowed = false; } //////////////////////////////////////////////////////////// diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 4e5b7cf42f1..bb4a995240f 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1861,10 +1861,10 @@ class TC_GAME_API Unit : public WorldObject uint16 GetVirtualItemAppearanceMod(uint32 slot) const; void SetVirtualItem(uint32 slot, uint32 itemId, uint16 appearanceModId = 0, uint16 itemVisual = 0); - // returns if the unit is ignoring any combat interaction - bool IsIgnoringCombat() const { return _isIgnoringCombat; } - // enables/disables combat interaction of this unit. - void SetIgnoringCombat(bool apply) { _isIgnoringCombat = apply; } + // returns if the unit can't enter combat + bool IsCombatDisallowed() const { return _isCombatDisallowed; } + // enables / disables combat interaction of this unit + void SetIsCombatDisallowed(bool apply) { _isCombatDisallowed = apply; } std::string GetDebugInfo() const override; @@ -2046,7 +2046,7 @@ class TC_GAME_API Unit : public WorldObject std::unique_ptr<MovementForces> _movementForces; PositionUpdateInfo _positionUpdateInfo; - bool _isIgnoringCombat; + bool _isCombatDisallowed; }; namespace Trinity |
