Changeset 18 for trunk/src/game/GameObject.cpp

Timestamp:

11/19/08 13:23:29 (17 years ago)

Author:

yumileroy

Message:

[svn] * Little fix in RandomMovementGenerator?
* Updated to 6731 and 680

Original author: Neo2003
Date: 2008-10-06 04:48:59-05:00

Files:

• trunk/src/game/GameObject.cpp (modified) (8 diffs)

trunk/src/game/GameObject.cpp

@@ -55 +55 @@
     m_cooldownTime = 0;
     m_goInfo = NULL;
+
+    m_DBTableGuid = 0;
 }
 
@@ -109 +111 @@
     Object::_Create(guidlow, goinfo->id, HIGHGUID_GAMEOBJECT);
 
-    m_DBTableGuid = guidlow;
     m_goInfo = goinfo;
 
@@ -479 +480 @@
 void GameObject::SaveToDB()
 {
-    // this should only be used when the creature has already been loaded
+    // this should only be used when the gameobject has already been loaded
     // perferably after adding to map, because mapid may not be valid otherwise
     GameObjectData const *data = objmgr.GetGOData(m_DBTableGuid);
@@ -497 +498 @@
     if (!goI)
         return;
-
+    
+    if (!m_DBTableGuid)
+        m_DBTableGuid = GetGUIDLow();
     // update in loaded data (changing data only in this place)
     GameObjectData& data = objmgr.NewGOData(m_DBTableGuid);
@@ -567 +570 @@
     uint32 go_state = data->go_state;
 
-    uint32 stored_guid = guid;
+    m_DBTableGuid = guid;
     if (map->GetInstanceId() != 0) guid = objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT);
 
     if (!Create(guid,entry, map, x, y, z, ang, rotation0, rotation1, rotation2, rotation3, animprogress, go_state) )
         return false;
-
-    m_DBTableGuid = stored_guid;
 
     switch(GetGOInfo()->type)
@@ -590 +591 @@
                 m_spawnedByDefault = true;
                 m_respawnDelayTime = data->spawntimesecs;
-                m_respawnTime = objmgr.GetGORespawnTime(stored_guid, map->GetInstanceId());
+                m_respawnTime = objmgr.GetGORespawnTime(m_DBTableGuid, map->GetInstanceId());
 
                                                             // ready to respawn
@@ -1159 +1160 @@
             Player* player = (Player*)user;
 
-            if( player->InBattleGround() &&                 // in battleground
-                !player->IsMounted() &&                     // not mounted
-                !player->HasStealthAura() &&                // not stealthed
-                !player->HasInvisibilityAura() &&           // not invisible
-                player->isAlive())                          // live player
-            {
+            if( player->isAllowUseBattleGroundObject() )
+            {
+                // in battleground check
                 BattleGround *bg = player->GetBattleGround();
                 if(!bg)
@@ -1187 +1185 @@
             Player* player = (Player*)user;
 
-            if( player->InBattleGround() &&                 // in battleground
-                !player->IsMounted() &&                     // not mounted
-                !player->HasStealthAura() &&                // not stealthed
-                !player->HasInvisibilityAura() &&           // not invisible
-                !player->HasAura(SPELL_RECENTLY_DROPPED_FLAG, 0) &&  // can't pickup
-                player->isAlive())                          // live player
-            {
+            if( player->isAllowUseBattleGroundObject() )     
+            {
+                // in battleground check
                 BattleGround *bg = player->GetBattleGround();
                 if(!bg)