diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-05-30 23:09:34 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2015-05-30 23:09:34 +0200 |
| commit | 25881ca95fd3c8e6c8aecb93739d1642c7a4d9c8 (patch) | |
| tree | 05d611f7a6f5bea5078a4704a73f704fe9587d8e /src/server/scripts/Outland | |
| parent | 35f2f5530abc3308cfc6b107255eaa3c82076e76 (diff) | |
Core/Misc: Fix issues reported by static analysis
Coverity defect IDs: 1022861, 1022862, 1022863, 1302435, 1302439, 1302440
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp | 18 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_hellfire_peninsula.cpp | 7 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index 81c1283768b..500b0ae4bcb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -84,17 +84,13 @@ class boss_shattered_executioner : public CreatureScript _Reset(); // _Reset() resets the loot mode, so we add them again, if any - switch (instance->GetData(DATA_PRISONERS_EXECUTED)) - { - case 0: - me->AddLootMode(LOOT_MODE_HARD_MODE_3); - case 1: - me->AddLootMode(LOOT_MODE_HARD_MODE_2); - case 2: - me->AddLootMode(LOOT_MODE_HARD_MODE_1); - default: - break; - } + uint32 prisonersExecuted = instance->GetData(DATA_PRISONERS_EXECUTED); + if (prisonersExecuted == 0) + me->AddLootMode(LOOT_MODE_HARD_MODE_3); + if (prisonersExecuted <= 1) + me->AddLootMode(LOOT_MODE_HARD_MODE_2); + if (prisonersExecuted <= 2) + me->AddLootMode(LOOT_MODE_HARD_MODE_1); if (instance->GetBossState(DATA_KARGATH) == DONE) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 471c776d54b..d1a31906d58 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -770,7 +770,8 @@ public: void Initialize() { circleRounds = 0; - point = 0; + point = 3; + wpreached = false; } void Reset() override @@ -778,9 +779,7 @@ public: events.Reset(); summons.DespawnAll(); - circleRounds = 0; - point = 3; - wpreached = false; + Initialize(); } void DoAction(int32 action) override |