Changeset 28 for trunk/src/game/Creature.cpp

Timestamp:

11/19/08 13:24:39 (17 years ago)

Author:

yumileroy

Message:

[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

Original author: Neo2003
Date: 2008-10-09 08:42:22-05:00

Files:

• trunk/src/game/Creature.cpp (modified) (2 diffs)

trunk/src/game/Creature.cpp

@@ -74 +74 @@
     }
     return false;
+}
+
+size_t VendorItemData::FindItemSlot(uint32 item_id) const
+{
+    for(size_t i = 0; i < m_items.size(); ++i )
+        if(m_items[i]->item==item_id)
+            return i;
+    return m_items.size();
 }
 
@@ -1911 +1919 @@
 void Creature::GetRespawnCoord( float &x, float &y, float &z, float* ori, float* dist ) const
 {
-    if(CreatureData const* data = objmgr.GetCreatureData(GetDBTableGUIDLow()))
-    {
-        x = data->posX;
-        y = data->posY;
-        z = data->posZ;
-        if(ori)
-            *ori = data->orientation;
-        if(dist)
-            *dist = data->spawndist;
-    }
-    else
-    {
-        x = GetPositionX();
-        y = GetPositionY();
-        z = GetPositionZ();
-        if(ori)
-            *ori = GetOrientation();
-        if(dist)
-            *dist = 0;
-    }
+    if (m_DBTableGuid)
+    {
+        if (CreatureData const* data = objmgr.GetCreatureData(GetDBTableGUIDLow()))
+        {
+            x = data->posX;
+            y = data->posY;
+            z = data->posZ;
+            if(ori)
+                *ori = data->orientation;
+            if(dist)
+                *dist = data->spawndist;
+
+            return;
+        }
+    }
+
+    x = GetPositionX();
+    y = GetPositionY();
+    z = GetPositionZ();
+    if(ori)
+        *ori = GetOrientation();
+    if(dist)
+        *dist = 0;
 }