aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2020-08-04 09:36:47 +0000
committerShauren <shauren.trinity@gmail.com>2022-01-26 14:06:40 +0100
commit864d775280097f9b6440e4fef1d3800b48b254ae (patch)
tree9cd881a957dc715819a8a530a42777d45000892a /src/server/scripts/Outland
parentafcb13cd44cf77d6599805f7160d9255c0a6ca4c (diff)
Core/Misc: Fix static analysis issues (#25194)
(cherry picked from commit 07fd84b679fd6958b7e669a96c78783875e1b949)
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp3
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp5
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp16
3 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 6fe4079daae..92e4e721113 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -686,8 +686,7 @@ public:
while (unit == nullptr || !unit->IsAlive())
unit = selectAdvisorUnit();
- if (unit && unit->IsAlive())
- DoCast(unit, SPELL_HEAL);
+ DoCast(unit, SPELL_HEAL);
Heal_Timer = 60000;
}
else
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index aa4801a6909..5cd82f894db 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -222,7 +222,7 @@ public:
{
//Teleport 4 players under the waterfalls
GuidSet targets;
- GuidSet::const_iterator itr;
+ GuidSet::const_iterator itr = targets.begin();
for (uint8 i = 0; i < 4; ++i)
{
counter = 0;
@@ -260,7 +260,7 @@ public:
if (WateryGlobules_Timer <= diff)
{
GuidSet globules;
- GuidSet::const_iterator itr;
+ GuidSet::const_iterator itr = globules.begin();
for (uint8 g = 0; g < 4; g++) //one unit can't cast more than one spell per update, so some players have to cast for us XD
{
counter = 0;
@@ -274,6 +274,7 @@ public:
break;
++counter;
} while (itr != globules.end());
+
if (pGlobuleTarget)
{
globules.insert(pGlobuleTarget->GetGUID());
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index fb70d79975f..39e94936bf0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -190,19 +190,19 @@ class instance_blood_furnace : public InstanceMapScript
void ResetPrisons()
{
ResetPrisoners(PrisonersCell5);
- PrisonerCounter5 = PrisonersCell5.size();
+ PrisonerCounter5 = uint8(PrisonersCell5.size());
HandleGameObject(PrisonCellGUIDs[DATA_PRISON_CELL5 - DATA_PRISON_CELL1], false);
ResetPrisoners(PrisonersCell6);
- PrisonerCounter6 = PrisonersCell6.size();
+ PrisonerCounter6 = uint8(PrisonersCell6.size());
HandleGameObject(PrisonCellGUIDs[DATA_PRISON_CELL6 - DATA_PRISON_CELL1], false);
ResetPrisoners(PrisonersCell7);
- PrisonerCounter7 = PrisonersCell7.size();
+ PrisonerCounter7 = uint8(PrisonersCell7.size());
HandleGameObject(PrisonCellGUIDs[DATA_PRISON_CELL7 - DATA_PRISON_CELL1], false);
ResetPrisoners(PrisonersCell8);
- PrisonerCounter8 = PrisonersCell8.size();
+ PrisonerCounter8 = uint8(PrisonersCell8.size());
HandleGameObject(PrisonCellGUIDs[DATA_PRISON_CELL8 - DATA_PRISON_CELL1], false);
}
@@ -242,12 +242,12 @@ class instance_blood_furnace : public InstanceMapScript
if (posX >= 405.0f && posX <= 423.0f && posZ <= 17)
{
- if (posY >= 106.0f && posY <= 123.0f && posZ <= 17)
+ if (posY >= 106.0f && posY <= 123.0f)
{
PrisonersCell5.insert(creature->GetGUID());
++PrisonerCounter5;
}
- else if (posY >= 76.0f && posY <= 91.0f && posZ <= 17)
+ else if (posY >= 76.0f && posY <= 91.0f)
{
PrisonersCell6.insert(creature->GetGUID());
++PrisonerCounter6;
@@ -256,12 +256,12 @@ class instance_blood_furnace : public InstanceMapScript
}
else if (posX >= 490.0f && posX <= 506.0f && posZ <= 17)
{
- if (posY >= 106.0f && posY <= 123.0f && posZ <= 17)
+ if (posY >= 106.0f && posY <= 123.0f)
{
PrisonersCell7.insert(creature->GetGUID());
++PrisonerCounter7;
}
- else if (posY >= 76.0f && posY <= 91.0f && posZ <= 17)
+ else if (posY >= 76.0f && posY <= 91.0f)
{
PrisonersCell8.insert(creature->GetGUID());
++PrisonerCounter8;