From d38da3dd05d79d59e2de614111da99feff93a29a Mon Sep 17 00:00:00 2001 From: megamage Date: Sat, 13 Jun 2009 09:45:44 -0500 Subject: [8001] Fixed display id checks for creature case. Author: VladimirMangos --HG-- branch : trunk --- src/game/ObjectMgr.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/game/ObjectMgr.cpp') diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 076f5900716..f090a95af8e 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -621,7 +621,8 @@ void ObjectMgr::LoadCreatureTemplates() if(cInfo->DisplayID_A2) { - if(CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_A2)) + CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_A2); + if(!displayEntry) { sLog.outErrorDb("Creature (Entry: %u) has non-existing DisplayID_A2 id (%u), can crash client", cInfo->Entry, cInfo->DisplayID_A2); const_cast(cInfo)->DisplayID_A2 = 0; @@ -635,7 +636,8 @@ void ObjectMgr::LoadCreatureTemplates() if(cInfo->DisplayID_H2) { - if(CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_H2)) + CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_H2); + if(!displayEntry) { sLog.outErrorDb("Creature (Entry: %u) has non-existing DisplayID_H2 id (%u), can crash client", cInfo->Entry, cInfo->DisplayID_H2); const_cast(cInfo)->DisplayID_H2 = 0; -- cgit v1.2.3