araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 13:39:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.x and some warning fixes

Browse Source
This commit is contained in:
Spp
2011-12-27 10:05:49 +01:00
parent 8323027e0c 3176289024
commit fa9daaf95b
148 changed files with 2881 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/GameObject/GameObject.cpp
+13 -3
View File
@@ -30,7 +30,7 @@
#include "CreatureAISelector.h"
#include "Group.h"
GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue), m_AI(NULL)
GameObject::GameObject() : WorldObject(false), m_goValue(new GameObjectValue), m_AI(NULL)
{
m_objectType |= TYPEMASK_GAMEOBJECT;
m_objectTypeId = TYPEID_GAMEOBJECT;
@@ -770,8 +770,18 @@ void GameObject::DeleteFromDB()
{
sObjectMgr->RemoveGORespawnTime(m_DBTableGuid, GetInstanceId());
sObjectMgr->DeleteGOData(m_DBTableGuid);
WorldDatabase.PExecute("DELETE FROM gameobject WHERE guid = '%u'", m_DBTableGuid);
WorldDatabase.PExecute("DELETE FROM game_event_gameobject WHERE guid = '%u'", m_DBTableGuid);
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_GAMEOBJECT);
stmt->setUInt32(0, m_DBTableGuid);
WorldDatabase.Execute(stmt);
stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_EVENT_GAMEOBJECT);
stmt->setUInt32(0, m_DBTableGuid);
WorldDatabase.Execute(stmt);
}
GameObject* GameObject::GetGameObject(WorldObject& object, uint64 guid)