Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fix issues reported by static analysis

Browse Source 
Coverity defect IDs: 1022861, 1022862, 1022863, 1302435, 1302439, 1302440
This commit is contained in:
jackpoz
2015-05-30 23:09:34 +02:00
parent 35f2f5530a
commit 25881ca95f
3 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
View File

@@ -903,17 +903,15 @@ class boss_yogg_saron : public CreatureScript
DoCast(me, SPELL_KNOCK_AWAY);
me->ResetLootMode();
switch (_instance->GetData(DATA_KEEPERS_COUNT))
{
case 0:
me->AddLootMode(LOOT_MODE_HARD_MODE_4);
case 1:
me->AddLootMode(LOOT_MODE_HARD_MODE_3);
case 2:
me->AddLootMode(LOOT_MODE_HARD_MODE_2);
case 3:
me->AddLootMode(LOOT_MODE_HARD_MODE_1);
}
uint32 keepersCount = _instance->GetData(DATA_KEEPERS_COUNT);
if (keepersCount == 0)
me->AddLootMode(LOOT_MODE_HARD_MODE_4);
if (keepersCount <= 1)
me->AddLootMode(LOOT_MODE_HARD_MODE_3);
if (keepersCount <= 2)
me->AddLootMode(LOOT_MODE_HARD_MODE_2);
if (keepersCount <= 3)
me->AddLootMode(LOOT_MODE_HARD_MODE_1);
}
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override

18
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
View File

@@ -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);

7
src/server/scripts/Outland/zone_hellfire_peninsula.cpp
View File

@@ -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