diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-04-01 20:36:30 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-04-01 20:36:30 +0200 |
| commit | 98e848436dd2bc8cebbbb5059a24c5ffcfd799a6 (patch) | |
| tree | e31f1d022e963bf86170f9ff5c90b7a22d4d3822 /src/server/game | |
| parent | 2485d13e35cee4520323aad25313f3453537de6d (diff) | |
Core/Misc: Apply various cosmetic changes that were made to 3.3.5 branch when porting master branch code there
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 5 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.h | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 2c7e93cb0af..ef5dac43d9d 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -69,8 +69,8 @@ void SmartAI::StartPath(bool run/* = false*/, uint32 pathId/* = 0*/, bool repeat if (invoker && invoker->GetTypeId() == TYPEID_PLAYER) { - _escortNPCFlags = me->m_unitData->NpcFlags[0]; - me->ReplaceAllNpcFlags((NPCFlags)0); + _escortNPCFlags = me->GetNpcFlags(); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); } me->GetMotionMaster()->MovePath(_path, _repeatWaypointPath); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index aa9ec20bc68..0fbb844891d 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -2124,9 +2124,4 @@ namespace Trinity }; } -inline void SetUnitCurrentCastSpell(Unit* unit, Spell* spell) -{ - unit->SetCurrentCastSpell(spell); -} - #endif diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 76cba756fd0..64f7b6db188 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -237,7 +237,6 @@ static const uint32 SPELL_INTERRUPT_NONPLAYER = 32747; class TC_GAME_API Spell { - friend void SetUnitCurrentCastSpell(Unit* unit, Spell* spell); friend class SpellScript; public: |