diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-10-21 16:42:07 +0200 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-01-13 22:04:52 +0100 |
| commit | d8804418ce9d54c9bc6c897771be900278159bb6 (patch) | |
| tree | 552748941057b1e0de1063147c89eaf0cee82161 /src | |
| parent | 21d28a0190679ad200eb5e19a726c134235abeae (diff) | |
Core/SAI: Fix static analysis issue
Initialize uninitialized value, move class field from public to private.
(cherry picked from commit 7dc97c035350f9505a9fba0b8ec2d2037044e586)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.h | 6 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 3327a43cf43..3bace8b773b 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -32,7 +32,7 @@ SmartAI::SmartAI(Creature* creature) : CreatureAI(creature), mIsCharmed(false), mFollowCreditType(0), mFollowArrivedTimer(0), mFollowCredit(0), mFollowArrivedEntry(0), mFollowDist(0.f), mFollowAngle(0.f), _escortState(SMART_ESCORT_NONE), _escortNPCFlags(0), _escortInvokerCheckTimer(1000), _currentWaypointNode(0), _waypointReached(false), _waypointPauseTimer(0), _waypointPauseForced(false), _repeatWaypointPath(false), _OOCReached(false), _waypointPathEnded(false), mRun(true), mEvadeDisabled(false), mCanAutoAttack(true), mCanCombatMove(true), mInvincibilityHpLevel(0), mDespawnTime(0), mDespawnState(0), mJustReset(false), - mConditionsTimer(0), _gossipReturn(false) + mConditionsTimer(0), _gossipReturn(false), mEscortQuestID(0) { mHasConditions = sConditionMgr->HasConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE, creature->GetEntry()); } diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 4e9a9f976a6..50a587df900 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -181,8 +181,6 @@ class TC_GAME_API SmartAI : public CreatureAI void QuestReward(Player* player, Quest const* quest, uint32 opt) override; void OnGameEvent(bool start, uint16 eventId) override; - uint32 mEscortQuestID; - void SetDespawnTime (uint32 t, uint32 r = 0) { mDespawnTime = t; @@ -198,6 +196,8 @@ class TC_GAME_API SmartAI : public CreatureAI void SetGossipReturn(bool val) { _gossipReturn = val; } + void SetEscortQuest(uint32 questID) { mEscortQuestID = questID; } + private: bool AssistPlayerInCombatAgainst(Unit* who); void ReturnToLastOOCPos(); @@ -246,6 +246,8 @@ class TC_GAME_API SmartAI : public CreatureAI // Gossip bool _gossipReturn; + + uint32 mEscortQuestID; }; class TC_GAME_API SmartGameObjectAI : public GameObjectAI diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index fa05118537c..3a18f984137 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1353,7 +1353,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u uint32 quest = e.action.wpStart.quest; uint32 DespawnTime = e.action.wpStart.despawnTime; - ENSURE_AI(SmartAI, me->AI())->mEscortQuestID = quest; + ENSURE_AI(SmartAI, me->AI())->SetEscortQuest(quest); ENSURE_AI(SmartAI, me->AI())->SetDespawnTime(DespawnTime); break; } |