From 7dc97c035350f9505a9fba0b8ec2d2037044e586 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 21 Oct 2017 16:42:07 +0200 Subject: Core/SAI: Fix static analysis issue Initialize uninitialized value, move class field from public to private. --- src/server/game/AI/SmartScripts/SmartAI.cpp | 2 +- src/server/game/AI/SmartScripts/SmartAI.h | 6 ++++-- src/server/game/AI/SmartScripts/SmartScript.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 77a6ba642be..640b296d3a3 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 9c22b509bc9..6c6bfc3ed11 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) { mDespawnTime = t; @@ -196,6 +194,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(); @@ -243,6 +243,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 6addb2c748f..d0ef589a69a 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1332,7 +1332,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; } -- cgit v1.2.3