From 0f61bac93d4285f5583239695ecd113b568a8787 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Sun, 5 Apr 2009 18:56:10 +0200 Subject: * Do proper checks at startup for creature_formations table. Also remove useless lastLeaderGUID variable. --HG-- branch : trunk --- src/game/CreatureGroups.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index 1314e865b48..24f67ec8901 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -87,7 +87,7 @@ void CreatureGroupManager::LoadCreatureFormations() return; } - uint32 total_records = result->GetRowCount(), lastLeaderGUID = 0; + uint32 total_records = result->GetRowCount(); barGoLink bar( total_records); Field *fields; @@ -110,10 +110,24 @@ void CreatureGroupManager::LoadCreatureFormations() group_member->follow_angle = fields[3].GetUInt32(); } - CreatureGroupMap[group_member->memberGUID] = group_member; + // check data correctness + { + QueryResult* 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); + continue; + } - if(lastLeaderGUID != group_member->leaderGUID) - lastLeaderGUID = group_member->leaderGUID; + result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->memberGUID); + if(!result) + { + sLog.outErrorDb("creature_formations table member guid %u incorrect (not exist)", group_member->memberGUID); + continue; + } + } + + CreatureGroupMap[group_member->memberGUID] = group_member; } while(result->NextRow()) ; -- cgit v1.2.3