* 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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 2e36fb78ecd..fe3fd606de3 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -1575,10 +1575,17 @@ void ObjectMgr::LoadGameobjects()
             continue;
         }
 
-        if(!gInfo->displayId && (!gInfo->type == GAMEOBJECT_TYPE_TRAP || !gInfo->type == GAMEOBJECT_TYPE_SPELL_FOCUS))
+        if (!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;
+            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);
+                    continue;
+            }
         }
 
         if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId))