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/CreatureGroups.cpp | |
| parent | 76102c1cdd0fc8bb473f9b3fd3965cea5a3794f6 (diff) | |
| parent | d9cb0702158fd045285f2c0a904cb31a45a3864a (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/CreatureGroups.cpp')
| -rw-r--r-- | src/game/CreatureGroups.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index afaca9cf714..6b497129fe8 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -78,14 +78,13 @@ void CreatureGroupManager::LoadCreatureFormations() CreatureGroupMap.clear(); //Check Integrity of the table - QueryResult *result = WorldDatabase.PQuery("SELECT MAX(leaderGUID) FROM creature_formations"); + QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT MAX(leaderGUID) FROM creature_formations"); if(!result) { sLog.outErrorDb(" ...an error occured while loading the table creature_formations ( maybe it doesn't exist ?)\n"); return; } - delete result; //Get group data result = WorldDatabase.PQuery("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID"); @@ -126,14 +125,13 @@ void CreatureGroupManager::LoadCreatureFormations() // check data correctness { - QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->leaderGUID); + QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->leaderGUID); if(!result) { sLog.outErrorDb("creature_formations table leader guid %u incorrect (not exist)", group_member->leaderGUID); delete group_member; continue; } - delete result; result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", memberGUID); if(!result) @@ -142,7 +140,6 @@ void CreatureGroupManager::LoadCreatureFormations() delete group_member; continue; } - delete result; } CreatureGroupMap[memberGUID] = group_member; @@ -152,8 +149,6 @@ void CreatureGroupManager::LoadCreatureFormations() sLog.outString(); sLog.outString( ">> Loaded %u creatures in formations", total_records ); sLog.outString(); - //Free some heap - delete result; } void CreatureGroup::AddMember(Creature *member) |