From 25acef257240edb7763eac043554ca7c7ac767eb Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 17 May 2013 21:11:18 -0500 Subject: * Batch of fixes for issues found by static analysis. --- .../Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp | 2 +- src/server/scripts/Kalimdor/zone_winterspring.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/server/scripts/Kalimdor') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 630c379e71e..87a09749724 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -773,7 +773,7 @@ public: void JustSummoned(Creature* summon) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); - if (target && summon) + if (target) summon->Attack(target, false); summons.Summon(summon); } diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 2b68c0a2cb6..c523cfba952 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -182,10 +182,8 @@ public: } if (!found) - { return; - } - + DoNextDialogueStep(); } @@ -210,7 +208,7 @@ private: void DoNextDialogueStep() { // Last Dialogue Entry done? - if (_currentEntry && !_currentEntry->TextEntry) + if (!_currentEntry || !_currentEntry->TextEntry) { _actionTimer = 0; return; -- cgit v1.2.3