diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-04-26 18:01:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-04-26 18:01:50 +0200 |
| commit | 2f859ffd2e042678d5977a6f054bbcb23ff11bfe (patch) | |
| tree | 88454ebefb1bec61096af57ca89f634c4b9c0d30 /src/server/game/Entities | |
| parent | 65eefebe436f81112c4325ec3cc120a85e3e22a8 (diff) | |
Core/Misc: Fixed issues found by coverity
CID 1374575, 1374574, 1374573, 1374572, 1374563, 1374556
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 13 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h index cc9e75c01ce..98778d9fa83 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h +++ b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h @@ -105,6 +105,7 @@ public: AreaTriggerTemplate() { Id = 0; + Type = AREATRIGGER_TYPE_MAX; Flags = 0; ScriptId = 0; MaxSearchRadius = 0.0f; diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 2edae6f50ae..f44fd4932e8 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -660,7 +660,7 @@ typedef std::list<VendorItemCount> VendorItemCounts; struct TrainerSpell { - TrainerSpell() : SpellID(0), MoneyCost(0), ReqSkillLine(0), ReqSkillRank(0), ReqLevel(0) + TrainerSpell() : SpellID(0), MoneyCost(0), ReqSkillLine(0), ReqSkillRank(0), ReqLevel(0), Index(0) { for (uint8 i = 0; i < MAX_TRAINERSPELL_ABILITY_REQS; ++i) ReqAbility[i] = 0; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 40cca32bc56..1c766894219 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -26795,14 +26795,12 @@ float Player::GetAverageItemLevel() const if (i == EQUIPMENT_SLOT_TABARD || i == EQUIPMENT_SLOT_RANGED || i == EQUIPMENT_SLOT_OFFHAND || i == EQUIPMENT_SLOT_BODY) continue; - if (m_items[i] && m_items[i]->GetTemplate()) + if (m_items[i]) sum += m_items[i]->GetItemLevel(this); ++count; } - if (count == 0) - return 0; return ((float)sum) / count; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4119f74ee82..afafb063d8d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13207,14 +13207,11 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const break; } } - else - { - if (Player::TeamForRace(getRace()) == ALLIANCE) - return (getRace() == RACE_WORGEN ? 37729 : 21243); - if (getRace() == RACE_TROLL) - return 37730; - return 21244; - } + if (Player::TeamForRace(getRace()) == ALLIANCE) + return (getRace() == RACE_WORGEN ? 37729 : 21243); + if (getRace() == RACE_TROLL) + return 37730; + return 21244; case FORM_MOONKIN_FORM: { switch (getRace()) |