* Better way to do the check in rev 6697.

00:33:56 | @runningnak3d: Leave a big message in the commit log to along the lines of "runningnak3d didn't know what the f*** he was doing" :)

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2009-12-22 00:36:02 +01:00
parent 8ffb5cd33a
commit c0c72c28f6
+8 -1
View File
@@ -1575,11 +1575,18 @@ void ObjectMgr::LoadGameobjects()
continue; continue;
} }
if(!gInfo->displayId && (!gInfo->type == GAMEOBJECT_TYPE_TRAP || !gInfo->type == GAMEOBJECT_TYPE_SPELL_FOCUS)) if (!gInfo->displayId)
{ {
switch (gInfo->type)
{
case GAMEOBJECT_TYPE_TRAP:
case GAMEOBJECT_TYPE_SPELL_FOCUS:
break;
default:
sLog.outErrorDb("Gameobject (GUID: %u Entry %u GoType: %u) doesn't have displayId (%u), not loaded.", guid, entry, gInfo->type, gInfo->displayId); sLog.outErrorDb("Gameobject (GUID: %u Entry %u GoType: %u) doesn't have displayId (%u), not loaded.", guid, entry, gInfo->type, gInfo->displayId);
continue; continue;
} }
}
if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId)) if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId))
{ {