aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-02-08 21:04:20 +0100
committerjackpoz <giacomopoz@gmail.com>2015-02-08 21:04:20 +0100
commit27e71f180509cde842d8af70671e91bee38c4585 (patch)
tree6fd8af581c6896b85f7d7d5e2a50b504c2fc895d /src
parentbbce7d03428a15e36328879f71b9089aaabbb98c (diff)
Core/Misc: Fix static analysis issues
Fix some static analysis issues reported by Coverity
Diffstat (limited to 'src')
-rw-r--r--src/server/collision/Management/VMapManager2.cpp2
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp1
-rw-r--r--src/server/game/OutdoorPvP/OutdoorPvP.cpp2
-rw-r--r--src/server/scripts/Spells/spell_dk.cpp4
4 files changed, 6 insertions, 3 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index f85fceb7b39..f9fcff96ad2 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -236,9 +236,11 @@ namespace VMAP
{
floor = info.ground_Z;
ASSERT(floor < std::numeric_limits<float>::max());
+ ASSERT(info.hitModel);
type = info.hitModel->GetLiquidType(); // entry from LiquidType.dbc
if (reqLiquidType && !(GetLiquidFlagsPtr(type) & reqLiquidType))
return false;
+ ASSERT(info.hitInstance);
if (info.hitInstance->GetLiquidLevel(pos, info, level))
return true;
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6221191bba3..966490c6e23 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14883,6 +14883,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const
return 37174;
if (getRace() == RACE_WORGEN)
return 37173;
+ break;
case FORM_GHOSTWOLF:
if (HasAura(58135)) //! Glyph of Arctic Wolf
return 27312;
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index 5b2e8a513e3..6667672aee0 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
@@ -509,7 +509,7 @@ bool OPvPCapturePoint::HandleCustomSpell(Player* player, uint32 /*spellId*/, Gam
{
if (!player->IsOutdoorPvPActive())
return false;
- return false;
+ return true;
}
bool OutdoorPvP::HandleOpenGo(Player* player, ObjectGuid guid)
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index f28a51c8f75..9edf3f42b88 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -663,7 +663,7 @@ class spell_dk_festering_strike : public SpellScriptLoader
{
if (!sSpellMgr->GetSpellInfo(SPELL_DK_FROST_FEVER) || !sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PLAGUE) || !sSpellMgr->GetSpellInfo(SPELL_DK_CHAINS_OF_ICE))
return false;
- return false;
+ return true;
}
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
@@ -943,7 +943,7 @@ class spell_dk_raise_dead : public SpellScriptLoader
{
if (!spellInfo->GetEffect(EFFECT_0) || !sSpellMgr->GetSpellInfo(spellInfo->GetEffect(EFFECT_0)->CalcValue()))
return false;
- return false;
+ return true;
}
bool Load() override