aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Unit
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-04-26 18:01:50 +0200
committerShauren <shauren.trinity@gmail.com>2017-04-26 18:01:50 +0200
commit2f859ffd2e042678d5977a6f054bbcb23ff11bfe (patch)
tree88454ebefb1bec61096af57ca89f634c4b9c0d30 /src/server/game/Entities/Unit
parent65eefebe436f81112c4325ec3cc120a85e3e22a8 (diff)
Core/Misc: Fixed issues found by coverity
CID 1374575, 1374574, 1374573, 1374572, 1374563, 1374556
Diffstat (limited to 'src/server/game/Entities/Unit')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp13
1 files changed, 5 insertions, 8 deletions
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())