Changeset 123 for trunk/src/game/Totem.cpp

Timestamp:

11/19/08 13:38:18 (17 years ago)

Author:

yumileroy

Message:

[svn] * Changed modelid_a/h(2) values to modelid1..4, display ids are no longer incorrectly chosen based on player faction. Patch provided by WarHead?.

Original author: w12x
Date: 2008-10-27 11:48:45-05:00

Files:

• trunk/src/game/Totem.cpp (modified) (1 diff)

trunk/src/game/Totem.cpp

@@ -57 +57 @@
 void Totem::Summon(Unit* owner)
 {
+    CreatureInfo const *cinfo = GetCreatureInfo();
+    if (owner->GetTypeId()==TYPEID_PLAYER && cinfo)
+    {
+        if (uint32 modelid = cinfo->GetRandomValidModelId()) 
+            SetDisplayId(modelid);
+        else
+        {
+            sLog.outErrorDb("No displayid found for the totem with the entry %u! Can't summon it!", GetEntry());
+            return;
+        }
+    }
+
+    // Only add if a display exists.
     sLog.outDebug("AddObject at Totem.cpp line 49");
-
     SetInstanceId(owner->GetInstanceId());
     owner->GetMap()->Add((Creature*)this);
-
-    // select totem model in dependent from owner team
-    CreatureInfo const *cinfo = GetCreatureInfo();
-    if(owner->GetTypeId()==TYPEID_PLAYER && cinfo)
-    {
-        if(((Player*)owner)->GetTeam()==HORDE)
-            SetDisplayId(cinfo->DisplayID_H);
-        else
-            SetDisplayId(cinfo->DisplayID_A);
-    }
 
     WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);