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

Timestamp:

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

Author:

yumileroy

Message:

[svn] * Fixed startup error flood if creature model id is 0
* Fixed totems using proper model ids broken after recent change
* Set pet grid activity state to that of caster upon summoning
* Fix a possible crash in ObjectAccessor?
note to self: don't commit anything without 3 days testing. ever. after this one ofc.

Original author: w12x
Date: 2008-10-27 15:28:04-05:00

Files:

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

trunk/src/game/Totem.cpp

@@ -60 +60 @@
     if (owner->GetTypeId()==TYPEID_PLAYER && cinfo)
     {
-        if (uint32 modelid = cinfo->GetRandomValidModelId()) 
+        uint32 modelid = 0;
+        if(((Player*)owner)->GetTeam() == HORDE)
+        {
+            if(cinfo->Modelid3)
+                modelid = cinfo->Modelid3;
+            else if(cinfo->Modelid4)
+                modelid = cinfo->Modelid4;
+        }
+        else
+        {
+            if(cinfo->Modelid1)
+                modelid = cinfo->Modelid1;
+            else if(cinfo->Modelid2)
+                modelid = cinfo->Modelid2;
+        }
+        if (modelid)
             SetDisplayId(modelid);
         else
-        {
-            sLog.outErrorDb("No displayid found for the totem with the entry %u! Can't summon it!", GetEntry());
-            return;
-        }
+            sLog.outErrorDb("Totem::Summon: Missing modelid information for entry %u, team %u, totem will use default values.",GetEntry(),((Player*)owner)->GetTeam());
     }