diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-09-21 22:06:00 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-09-21 22:15:04 +0200 |
| commit | 6e27841382dab8946e5cb9b6e280e693bc0e2908 (patch) | |
| tree | aaa1fcefa61dfeb6bbd50306f0b3b5ebb4f25d0f /src/server/scripts/Northrend | |
| parent | dc814ed282ee954df8ec4d028e9445237b1b632c (diff) | |
Core/Misc: Refactor scripts to fix static analysis warnings
Seventh batch of fixes targeting 100 issues reported by Coverity
Diffstat (limited to 'src/server/scripts/Northrend')
6 files changed, 227 insertions, 71 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 7e83c24e0dd..fa4627e443b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -346,7 +346,6 @@ public: uint32 uiBladeStormTimer; uint32 uiInterceptTimer; uint32 uiMortalStrikeTimer; - uint32 uiAttackTimer; bool bDone; bool bHome; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index bd1a345e55b..eb01dfab141 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -345,6 +345,7 @@ public: Initialize(); _despawned = false; // We determine if Malygos will be realocated to spawning position on reset triggered by boss despawn on evade _flySpeed = me->GetSpeed(MOVE_FLIGHT); // Get initial fly speed, otherwise on each wipe fly speed would add up if we get it + _phase = PHASE_NOT_STARTED; } void Initialize() diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 7824fe86c87..6af60b322a7 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -67,7 +67,17 @@ public: struct npc_sinkhole_kill_creditAI : public ScriptedAI { - npc_sinkhole_kill_creditAI(Creature* creature) : ScriptedAI(creature){ } + npc_sinkhole_kill_creditAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + phaseTimer = 500; + phase = 0; + casterGuid.Clear(); + } uint32 phaseTimer; uint8 phase; @@ -75,9 +85,7 @@ public: void Reset() override { - phaseTimer = 500; - phase = 0; - casterGuid.Clear(); + Initialize(); } void SpellHit(Unit* caster, const SpellInfo* spell) override @@ -447,7 +455,18 @@ public: struct npc_nesingwary_trapperAI : public ScriptedAI { - npc_nesingwary_trapperAI(Creature* creature) : ScriptedAI(creature) { creature->SetVisible(false); } + npc_nesingwary_trapperAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + me->SetVisible(false); + phaseTimer = 2500; + phase = 1; + go_caribouGUID.Clear(); + } ObjectGuid go_caribouGUID; uint8 phase; @@ -455,10 +474,7 @@ public: void Reset() override { - me->SetVisible(false); - phaseTimer = 2500; - phase = 1; - go_caribouGUID.Clear(); + Initialize(); } void EnterCombat(Unit* /*who*/) override { } @@ -576,7 +592,16 @@ public: struct npc_lurgglbrAI : public npc_escortAI { - npc_lurgglbrAI(Creature* creature) : npc_escortAI(creature){ } + npc_lurgglbrAI(Creature* creature) : npc_escortAI(creature) + { + Initialize(); + } + + void Initialize() + { + IntroTimer = 0; + IntroPhase = 0; + } uint32 IntroTimer; uint32 IntroPhase; @@ -584,10 +609,7 @@ public: void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) - { - IntroTimer = 0; - IntroPhase = 0; - } + Initialize(); } void WaypointReached(uint32 waypointId) override @@ -723,6 +745,12 @@ public: { npc_nexus_drake_hatchlingAI(Creature* creature) : FollowerAI(creature) { + Initialize(); + } + + void Initialize() + { + WithRedDragonBlood = false; } ObjectGuid HarpoonerGUID; @@ -730,7 +758,7 @@ public: void Reset() override { - WithRedDragonBlood = false; + Initialize(); } void EnterCombat(Unit* who) override @@ -862,7 +890,26 @@ public: struct npc_thassarianAI : public npc_escortAI { - npc_thassarianAI(Creature* creature) : npc_escortAI(creature) { } + npc_thassarianAI(Creature* creature) : npc_escortAI(creature) + { + Initialize(); + } + + void Initialize() + { + arthasGUID.Clear(); + talbotGUID.Clear(); + leryssaGUID.Clear(); + arlosGUID.Clear(); + + arthasInPosition = false; + arlosInPosition = false; + leryssaInPosition = false; + talbotInPosition = false; + + phase = 0; + phaseTimer = 0; + } ObjectGuid arthasGUID; ObjectGuid talbotGUID; @@ -882,18 +929,7 @@ public: me->RestoreFaction(); me->RemoveStandFlags(UNIT_STAND_STATE_SIT); - arthasGUID.Clear(); - talbotGUID.Clear(); - leryssaGUID.Clear(); - arlosGUID.Clear(); - - arthasInPosition = false; - arlosInPosition = false; - leryssaInPosition = false; - talbotInPosition = false; - - phase = 0; - phaseTimer = 0; + Initialize(); } void WaypointReached(uint32 waypointId) override @@ -1239,7 +1275,20 @@ public: struct npc_counselor_talbotAI : public ScriptedAI { - npc_counselor_talbotAI(Creature* creature) : ScriptedAI(creature) { } + npc_counselor_talbotAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + leryssaGUID.Clear(); + arlosGUID.Clear(); + bCheck = false; + shadowBoltTimer = urand(5000, 12000); + deflectionTimer = urand(20000, 25000); + soulBlastTimer = urand(12000, 18000); + } ObjectGuid leryssaGUID; ObjectGuid arlosGUID; @@ -1252,12 +1301,7 @@ public: void Reset() override { - leryssaGUID.Clear(); - arlosGUID.Clear(); - bCheck = false; - shadowBoltTimer = urand(5000, 12000); - deflectionTimer = urand(20000, 25000); - soulBlastTimer = urand(12000, 18000); + Initialize(); } void MovementInform(uint32 uiType, uint32 /*uiId*/) override { @@ -1487,14 +1531,22 @@ public: struct npc_beryl_sorcererAI : public FollowerAI { - npc_beryl_sorcererAI(Creature* creature) : FollowerAI(creature) { } + npc_beryl_sorcererAI(Creature* creature) : FollowerAI(creature) + { + Initialize(); + } + + void Initialize() + { + bEnslaved = false; + } bool bEnslaved; void Reset() override { me->SetReactState(REACT_AGGRESSIVE); - bEnslaved = false; + Initialize(); } void EnterCombat(Unit* who) override @@ -1571,7 +1623,15 @@ public: struct npc_imprisoned_beryl_sorcererAI : public ScriptedAI { - npc_imprisoned_beryl_sorcererAI(Creature* creature) : ScriptedAI(creature) { } + npc_imprisoned_beryl_sorcererAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + rebuff = 0; + } uint32 rebuff; @@ -1580,7 +1640,7 @@ public: if (me->GetReactState() != REACT_PASSIVE) me->SetReactState(REACT_PASSIVE); - rebuff = 0; + Initialize(); } void UpdateAI(uint32 diff) override @@ -1775,12 +1835,21 @@ public: struct npc_bonker_togglevoltAI : public npc_escortAI { - npc_bonker_togglevoltAI(Creature* creature) : npc_escortAI(creature) { } + npc_bonker_togglevoltAI(Creature* creature) : npc_escortAI(creature) + { + Initialize(); + } + + void Initialize() + { + Bonker_agro = 0; + } + uint32 Bonker_agro; void Reset() override { - Bonker_agro=0; + Initialize(); SetDespawnAtFar(false); } @@ -1873,15 +1942,23 @@ public: struct npc_trapped_mammoth_calfAI : public ScriptedAI { - npc_trapped_mammoth_calfAI(Creature* creature) : ScriptedAI(creature) { } + npc_trapped_mammoth_calfAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + uiTimer = 1500; + bStarted = false; + } uint32 uiTimer; bool bStarted; void Reset() override { - uiTimer = 1500; - bStarted = false; + Initialize(); GameObject* pTrap = NULL; for (uint8 i = 0; i < MammothTrapsNum; ++i) @@ -2003,13 +2080,21 @@ public: struct npc_valiance_keep_cannoneerAI : public ScriptedAI { - npc_valiance_keep_cannoneerAI(Creature* creature) : ScriptedAI(creature) { } + npc_valiance_keep_cannoneerAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + uiTimer = urand(13000, 18000); + } uint32 uiTimer; void Reset() override { - uiTimer = urand(13000, 18000); + Initialize(); } void UpdateAI(uint32 diff) override @@ -2061,13 +2146,21 @@ public: struct npc_warmage_coldarraAI : public ScriptedAI { - npc_warmage_coldarraAI(Creature* creature) : ScriptedAI(creature) { } + npc_warmage_coldarraAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + m_uiTimer = 0; + } uint32 m_uiTimer; //Timer until recast void Reset() override { - m_uiTimer = 0; + Initialize(); } void EnterCombat(Unit* /*who*/) override { } @@ -2180,8 +2273,17 @@ public: { npc_hidden_cultistAI(Creature* creature) : ScriptedAI(creature) { - uiEmoteState = creature->GetUInt32Value(UNIT_NPC_EMOTESTATE); - uiNpcFlags = creature->GetUInt32Value(UNIT_NPC_FLAGS); + Initialize(); + uiEmoteState = creature->GetUInt32Value(UNIT_NPC_EMOTESTATE); + uiNpcFlags = creature->GetUInt32Value(UNIT_NPC_FLAGS); + } + + void Initialize() + { + uiEventTimer = 0; + uiEventPhase = 0; + + uiPlayerGUID.Clear(); } uint32 uiEmoteState; @@ -2200,10 +2302,7 @@ public: if (uiNpcFlags) me->SetUInt32Value(UNIT_NPC_FLAGS, uiNpcFlags); - uiEventTimer = 0; - uiEventPhase = 0; - - uiPlayerGUID.Clear(); + Initialize(); DoCast(SPELL_SHROUD_OF_THE_DEATH_CULTIST); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index e60c2162339..198fd53438a 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -279,12 +279,20 @@ public: struct npc_outhouse_bunnyAI : public ScriptedAI { - npc_outhouse_bunnyAI(Creature* creature) : ScriptedAI(creature) { } + npc_outhouse_bunnyAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } - void Reset() override + void Initialize() { _counter = 0; - _gender = 0; + _gender = 0; + } + + void Reset() override + { + Initialize(); } void SetData(uint32 Type, uint32 Data) override @@ -341,13 +349,21 @@ public: struct npc_tallhorn_stagAI : public ScriptedAI { - npc_tallhorn_stagAI(Creature* creature) : ScriptedAI(creature) { } + npc_tallhorn_stagAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } - void Reset() override + void Initialize() { _phase = 1; } + void Reset() override + { + Initialize(); + } + void UpdateAI(uint32 /*diff*/) override { if (_phase == 1) @@ -459,13 +475,21 @@ public: struct npc_wounded_skirmisherAI : public ScriptedAI { - npc_wounded_skirmisherAI(Creature* creature) : ScriptedAI(creature) { } + npc_wounded_skirmisherAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } - void Reset() override + void Initialize() { _despawnTimer = 5000; } + void Reset() override + { + Initialize(); + } + void MovementInform(uint32, uint32 id) override { if (id == 1) @@ -651,12 +675,20 @@ public: struct npc_lake_frogAI : public ScriptedAI { - npc_lake_frogAI(Creature* creature) : ScriptedAI(creature) { } + npc_lake_frogAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } - void Reset() override + void Initialize() { _following = false; _runningScript = false; + } + + void Reset() override + { + Initialize(); if (me->GetEntry() == NPC_LAKE_FROG_QUEST) me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 53dc2a62f90..adf2af50a8e 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -74,13 +74,22 @@ public: struct npc_Apothecary_HanesAI : public npc_escortAI { - npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature){ } + npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature) + { + Initialize(); + } + + void Initialize() + { + PotTimer = 10000; //10 sec cooldown on potion + } + uint32 PotTimer; void Reset() override { SetDespawnAtFar(false); - PotTimer = 10000; //10 sec cooldown on potion + Initialize(); } void JustDied(Unit* /*killer*/) override @@ -318,15 +327,23 @@ public: /// @todo make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?)) struct npc_daegarnAI : public ScriptedAI { - npc_daegarnAI(Creature* creature) : ScriptedAI(creature) { } + npc_daegarnAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + bEventInProgress = false; + uiPlayerGUID.Clear(); + } bool bEventInProgress; ObjectGuid uiPlayerGUID; void Reset() override { - bEventInProgress = false; - uiPlayerGUID.Clear(); + Initialize(); } void StartEvent(ObjectGuid uiGUID) diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 44f559bfa79..cde2cf94e3c 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -222,13 +222,21 @@ public: struct npc_crusade_recruitAI : public ScriptedAI { - npc_crusade_recruitAI(Creature* creature) : ScriptedAI(creature) { } + npc_crusade_recruitAI(Creature* creature) : ScriptedAI(creature) + { + Initialize(); + } + + void Initialize() + { + _heading = me->GetOrientation(); + } void Reset() override { me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER); - _heading = me->GetOrientation(); + Initialize(); } void UpdateAI(uint32 diff) override |
