diff options
8 files changed, 23 insertions, 23 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c5d72837cd2..93434359513 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -254,7 +254,7 @@ Creature::Creature(bool isWorldObject): Unit(isWorldObject), MapObject(), m_grou m_defaultMovementType(IDLE_MOTION_TYPE), m_spawnId(0), m_equipmentId(0), m_originalEquipmentId(0), m_AlreadyCallAssistance(false), m_AlreadySearchedAssistance(false), m_cannotReachTarget(false), m_cannotReachTimer(0), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0), m_homePosition(), m_transportHomePosition(), m_creatureInfo(nullptr), m_creatureData(nullptr), _waypointPathId(0), _currentWaypointNodeInfo(0, 0), m_formation(nullptr), m_triggerJustAppeared(true), m_respawnCompatibilityMode(false), _lastDamagedTime(0), - _regenerateHealth(true), _regenerateHealthLock(false), _isMissingSwimmingFlagOutOfCombat(false) + _regenerateHealth(true), _regenerateHealthLock(false), _isMissingCanSwimFlagOutOfCombat(false) { m_regenTimer = CREATURE_REGEN_INTERVAL; m_valuesCount = UNIT_END; @@ -2719,15 +2719,15 @@ bool Creature::CanEnterWater() const return GetMovementTemplate().IsSwimAllowed(); } -void Creature::RefreshSwimmingFlag(bool recheck) +void Creature::RefreshCanSwimFlag(bool recheck) { - if (!_isMissingSwimmingFlagOutOfCombat || recheck) - _isMissingSwimmingFlagOutOfCombat = !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SWIMMING); + if (!_isMissingCanSwimFlagOutOfCombat || recheck) + _isMissingCanSwimFlagOutOfCombat = !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CAN_SWIM); - // Check if the creature has UNIT_FLAG_SWIMMING and add it if it's missing + // Check if the creature has UNIT_FLAG_CAN_SWIM and add it if it's missing // Creatures must be able to chase a target in water if they can enter water - if (_isMissingSwimmingFlagOutOfCombat && CanEnterWater()) - SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SWIMMING); + if (_isMissingCanSwimFlagOutOfCombat && CanEnterWater()) + SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CAN_SWIM); } void Creature::AllLootRemovedFromCorpse() @@ -3335,7 +3335,7 @@ void Creature::AtEngage(Unit* target) if (!(GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_ALLOW_MOUNTED_COMBAT)) Dismount(); - RefreshSwimmingFlag(); + RefreshCanSwimFlag(); if (IsPet() || IsGuardian()) // update pets' speed for catchup OOC speed { diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index de1df1829fc..73ed5371b05 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -364,11 +364,11 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma void AtEngage(Unit* target) override; void AtDisengage() override; - bool HasSwimmingFlagOutOfCombat() const + bool HasCanSwimFlagOutOfCombat() const { - return !_isMissingSwimmingFlagOutOfCombat; + return !_isMissingCanSwimFlagOutOfCombat; } - void RefreshSwimmingFlag(bool recheck = false); + void RefreshCanSwimFlag(bool recheck = false); std::string GetDebugInfo() const override; @@ -457,7 +457,7 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma bool _regenerateHealth; // Set on creation bool _regenerateHealthLock; // Dynamically set - bool _isMissingSwimmingFlagOutOfCombat; + bool _isMissingCanSwimFlagOutOfCombat; }; class TC_GAME_API AssistDelayEvent : public BasicEvent diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h index 92abe700180..44cbe6bcd97 100644 --- a/src/server/game/Entities/Creature/CreatureData.h +++ b/src/server/game/Entities/Creature/CreatureData.h @@ -61,7 +61,7 @@ enum CreatureStaticFlags CREATURE_STATIC_FLAG_IGNORE_COMBAT = 0x02000000, // Actually only changes react state to passive CREATURE_STATIC_FLAG_ONLY_ATTACK_PVP_ENABLING = 0x04000000, // Only attack targets that are PvP enabling CREATURE_STATIC_FLAG_CALLS_GUARDS = 0x08000000, // Creature will summon a guard if player is within its aggro range (even if creature doesn't attack per se) - CREATURE_STATIC_FLAG_CAN_SWIM = 0x10000000, // UNIT_FLAG_SWIMMING + CREATURE_STATIC_FLAG_CAN_SWIM = 0x10000000, // UNIT_FLAG_CAN_SWIM CREATURE_STATIC_FLAG_FLOATING = 0x20000000, // creature_template_movement.Flight = 1 CREATURE_STATIC_FLAG_MORE_AUDIBLE = 0x40000000, // CREATURE_TYPE_FLAG_MORE_AUDIBLE CREATURE_STATIC_FLAG_LARGE_AOI = 0x80000000 // UnitFlags2 0x200000 diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 644e36a54f0..e56eeb3a387 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11600,7 +11600,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au AddUnitState(UNIT_STATE_CHARMED); if (Creature* creature = ToCreature()) - creature->RefreshSwimmingFlag(); + creature->RefreshCanSwimFlag(); if ((GetTypeId() != TYPEID_PLAYER) || (charmer->GetTypeId() != TYPEID_PLAYER)) { @@ -12778,7 +12778,7 @@ bool Unit::CanSwim() const return false; if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT)) return true; - return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_RENAME | UNIT_FLAG_SWIMMING); + return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_RENAME | UNIT_FLAG_CAN_SWIM); } void Unit::NearTeleportTo(Position const& pos, bool casting /*= false*/) diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h index 882975e7e69..80fa5c6bf2f 100644 --- a/src/server/game/Entities/Unit/UnitDefines.h +++ b/src/server/game/Entities/Unit/UnitDefines.h @@ -136,7 +136,7 @@ enum UnitFlags : uint32 UNIT_FLAG_PVP = 0x00001000, // changed in 3.0.3 UNIT_FLAG_SILENCED = 0x00002000, // silenced, 2.1.1 UNIT_FLAG_CANNOT_SWIM = 0x00004000, // 2.0.8 - UNIT_FLAG_SWIMMING = 0x00008000, // shows swim animation in water + UNIT_FLAG_CAN_SWIM = 0x00008000, // shows swim animation in water UNIT_FLAG_NON_ATTACKABLE_2 = 0x00010000, // removes attackable icon, if on yourself, cannot assist self but can cast TARGET_SELF spells - added by SPELL_AURA_MOD_UNATTACKABLE UNIT_FLAG_PACIFIED = 0x00020000, // 3.0.3 ok UNIT_FLAG_STUNNED = 0x00040000, // 3.0.3 ok diff --git a/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp b/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp index 4548f187ed8..78f3cf8d8e0 100644 --- a/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp +++ b/src/server/game/Entities/Unit/enuminfo_UnitDefines.cpp @@ -46,7 +46,7 @@ TC_API_EXPORT EnumText EnumUtils<UnitFlags>::ToString(UnitFlags value) case UNIT_FLAG_PVP: return { "UNIT_FLAG_PVP", "UNIT_FLAG_PVP", "changed in 3.0.3" }; case UNIT_FLAG_SILENCED: return { "UNIT_FLAG_SILENCED", "UNIT_FLAG_SILENCED", "silenced, 2.1.1" }; case UNIT_FLAG_CANNOT_SWIM: return { "UNIT_FLAG_CANNOT_SWIM", "UNIT_FLAG_CANNOT_SWIM", "2.0.8" }; - case UNIT_FLAG_SWIMMING: return { "UNIT_FLAG_SWIMMING", "UNIT_FLAG_SWIMMING", "shows swim animation in water" }; + case UNIT_FLAG_CAN_SWIM: return { "UNIT_FLAG_CAN_SWIM", "UNIT_FLAG_CAN_SWIM", "shows swim animation in water" }; case UNIT_FLAG_NON_ATTACKABLE_2: return { "UNIT_FLAG_NON_ATTACKABLE_2", "UNIT_FLAG_NON_ATTACKABLE_2", "removes attackable icon, if on yourself, cannot assist self but can cast TARGET_SELF spells - added by SPELL_AURA_MOD_UNATTACKABLE" }; case UNIT_FLAG_PACIFIED: return { "UNIT_FLAG_PACIFIED", "UNIT_FLAG_PACIFIED", "3.0.3 ok" }; case UNIT_FLAG_STUNNED: return { "UNIT_FLAG_STUNNED", "UNIT_FLAG_STUNNED", "3.0.3 ok" }; @@ -90,7 +90,7 @@ TC_API_EXPORT UnitFlags EnumUtils<UnitFlags>::FromIndex(size_t index) case 12: return UNIT_FLAG_PVP; case 13: return UNIT_FLAG_SILENCED; case 14: return UNIT_FLAG_CANNOT_SWIM; - case 15: return UNIT_FLAG_SWIMMING; + case 15: return UNIT_FLAG_CAN_SWIM; case 16: return UNIT_FLAG_NON_ATTACKABLE_2; case 17: return UNIT_FLAG_PACIFIED; case 18: return UNIT_FLAG_STUNNED; @@ -131,7 +131,7 @@ TC_API_EXPORT size_t EnumUtils<UnitFlags>::ToIndex(UnitFlags value) case UNIT_FLAG_PVP: return 12; case UNIT_FLAG_SILENCED: return 13; case UNIT_FLAG_CANNOT_SWIM: return 14; - case UNIT_FLAG_SWIMMING: return 15; + case UNIT_FLAG_CAN_SWIM: return 15; case UNIT_FLAG_NON_ATTACKABLE_2: return 16; case UNIT_FLAG_PACIFIED: return 17; case UNIT_FLAG_STUNNED: return 18; diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index 2405f97cc59..2e44fc4ce3d 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -144,8 +144,8 @@ void HomeMovementGenerator<Creature>::DoFinalize(Creature* owner, bool active, b if (movementInform && HasFlag(MOVEMENTGENERATOR_FLAG_INFORM_ENABLED)) { - if (!owner->HasSwimmingFlagOutOfCombat()) - owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SWIMMING); + if (!owner->HasCanSwimFlagOutOfCombat()) + owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CAN_SWIM); owner->SetSpawnHealth(); owner->LoadCreaturesAddon(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 703360978c8..4d6065bb503 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -569,7 +569,7 @@ public: me->RestoreFaction(); CombatAI::Reset(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SWIMMING); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CAN_SWIM); } void SpellHit(WorldObject* caster, SpellInfo const* spellInfo) override @@ -661,7 +661,7 @@ public: return true; me->SetImmuneToPC(false); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SWIMMING); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CAN_SWIM); player->CastSpell(me, SPELL_DUEL, false); player->CastSpell(player, SPELL_DUEL_FLAG, true); |