Core/Misc: Fix static analysis issues

This commit is contained in:
Aokromes committed 2017-11-12 15:26:24 +01:00
1 parent 51d0befe6d
commit 9595e0ca36
4 files changed
+9 -12

No files matched your search

@@ -406,12 +406,12 @@ void BattlegroundAB::_NodeOccupied(uint8 node, Team team)
void BattlegroundAB::_NodeDeOccupied(uint8 node)
{
//only dynamic nodes, no start points
if (node >= BG_AB_DYNAMIC_NODES_COUNT)
return;
//remove bonus honor aura trigger creature when node is lost
if (node < BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points
DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides
DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides
RelocateDeadPlayers(BgCreatures[node]);
+1 -1
View File
@@ -152,7 +152,7 @@ bool ItemChatLink::Initialize(std::istringstream& iss)
return false;
}
}
else if (id < 0)
else
{
_suffix = sItemRandomSuffixStore.LookupEntry(-id);
if (!_suffix)
+1 -1
View File
@@ -7737,7 +7737,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, QuestRelationsReve
if (reverseMap)
reverseMap->insert(QuestRelationsReverse::value_type(quest, id));
}
else if (starter)
else
poolRelationMap->insert(PooledQuestRelation::value_type(quest, id));
++count;
@@ -570,15 +570,12 @@ public:
Rebirth = true;
}
if (Rebirth)
if (Death_Timer <= diff)
{
if (Death_Timer <= diff)
{
me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
me->DisappearAndDie();
Rebirth = false;
} else Death_Timer -= diff;
}
me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
me->DisappearAndDie();
Rebirth = false;
} else Death_Timer -= diff;
}
if (!UpdateVictim())