diff options
| author | thenecromancer <none@none> | 2010-01-23 15:05:33 +0100 |
|---|---|---|
| committer | thenecromancer <none@none> | 2010-01-23 15:05:33 +0100 |
| commit | 39ba392c7538db1bd18e617185c28420780e237c (patch) | |
| tree | a620cd4b809816f697697af9478d6e538eb7cc5d /src/game/Map.cpp | |
| parent | 76102c1cdd0fc8bb473f9b3fd3965cea5a3794f6 (diff) | |
| parent | d9cb0702158fd045285f2c0a904cb31a45a3864a (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 5e41fcb3c57..0a6498e5c58 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -2357,7 +2357,7 @@ void Map::AddObjectToRemoveList(WorldObject *obj) { assert(obj->GetMapId()==GetId() && obj->GetInstanceId()==GetInstanceId()); - obj->CleanupsBeforeDelete(); // remove or simplify at least cross referenced links + obj->CleanupsBeforeDelete(false); // remove or simplify at least cross referenced links i_objectsToRemove.insert(obj); //sLog.outDebug("Object (GUID: %u TypeId: %u ) added to removing list.",obj->GetGUIDLow(),obj->GetTypeId()); @@ -2761,7 +2761,7 @@ void InstanceMap::CreateInstanceData(bool load) if (load) { // TODO: make a global storage for this - QueryResult* result = CharacterDatabase.PQuery("SELECT data FROM instance WHERE map = '%u' AND id = '%u'", GetId(), i_InstanceId); + QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT data FROM instance WHERE map = '%u' AND id = '%u'", GetId(), i_InstanceId); if (result) { Field* fields = result->Fetch(); @@ -2771,7 +2771,6 @@ void InstanceMap::CreateInstanceData(bool load) sLog.outDebug("Loading instance data for `%s` with id %u", objmgr.GetScriptName(i_script_id), i_InstanceId); i_data->Load(data); } - delete result; } } } |