Core/Unit: Add missing/update old shapeshifting modelforms for Shapeshifting - Fix by Kaelima

Closes issue 4804

--HG--
branch : trunk

2 files changed, 19 insertions, 8 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b3754da5142..8b5877e2f0b 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16340,17 +16340,24 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
                 return 2281;
             else
                 return 2289;
+        case FORM_THARONJA_SKELETON:
+            return 1034;
+        case FORM_STEVES_GHOUL:
+            return 128;
+        case FORM_AMBIENT:
+            return 328;
+        case FORM_ZOMBIE:
+            return 26942;
         case FORM_TRAVEL:
-            return 632;
+            return 918;
         case FORM_AQUA:
-            if (Player::TeamForRace(getRace()) == ALLIANCE)
-                return 2428;
-            else
-                return 2428;
+            return 2428;
         case FORM_GHOUL:
-            return 24994;
+            return 25527;
         case FORM_CREATUREBEAR:
-            return 902;
+            return 2281;
+        case FORM_CREATURECAT:
+            return 892;
         case FORM_GHOSTWOLF:
             return 4613;
         case FORM_FLIGHT:
@@ -16371,7 +16378,7 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
         case FORM_METAMORPHOSIS:
             return 25277;
         case FORM_MASTER_ANGLER:
-            return 15234;
+            return 17170;
         case FORM_TREE:
             return 864;
         case FORM_SPIRITOFREDEMPTION:
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 5c8406da59e..a0014d06bf1 100755
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -199,6 +199,10 @@ enum ShapeshiftForm
     FORM_AMBIENT            = 0x06,
     FORM_GHOUL              = 0x07,
     FORM_DIREBEAR           = 0x08,
+    FORM_STEVES_GHOUL       = 0x09,
+    FORM_THARONJA_SKELETON  = 0x0A,
+    FORM_TEST_OF_STRENGTH   = 0x0B,
+    FORM_BLB_PLAYER         = 0x0C,
     FORM_SHADOW_DANCE       = 0x0D,
     FORM_CREATUREBEAR       = 0x0E,
     FORM_CREATURECAT        = 0x0F,