diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp index daa66126..865b1078 100755 --- a/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -839,7 +839,10 @@ void GameServer::loadTerrain () Appearance * const appearance = AppearanceTemplateList::createAppearance(terrainFileName); if (appearance != NULL) { terrainObject->setAppearance(appearance); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for GameServer::loadTerrain missing for %s.", terrainFileName)); } + ProceduralTerrainAppearance * const proceduralTerrainAppearance = dynamic_cast(appearance); if (proceduralTerrainAppearance) { diff --git a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp index 17de52ee..8a9dfc3f 100755 --- a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp @@ -42,6 +42,8 @@ StaticObject::StaticObject(const ServerStaticObjectTemplate* newTemplate) : if(newAppearance != NULL) { setAppearance(newAppearance); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for StaticObject::StaticObject missing for %s.", newTemplate->DataResource::getName())); } } } diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index fa24fbe5..196f9ce9 100755 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -472,6 +472,8 @@ TangibleObject::TangibleObject(const ServerTangibleObjectTemplate* newTemplate) if(newAppearance != NULL) { setAppearance(newAppearance); + } else { + DEBUG_WARNING(true, ("Missing appearance for TangibleObject::TangibleObject %s", appearanceString.c_str())); } } } diff --git a/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp b/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp index 037fff74..a14c9980 100755 --- a/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp +++ b/engine/shared/library/sharedCollision/src/shared/core/DoorObject.cpp @@ -212,6 +212,8 @@ void DoorObject::createAppearance ( DoorInfo const & info ) if (appearance != NULL) { setAppearance(appearance); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, first stanza.")); } } @@ -237,6 +239,8 @@ void DoorObject::createAppearance ( DoorInfo const & info ) Extent * appearanceExtent = new Extent( Containment3d::EncloseSphere(verts) ); appearanceExtent->incrementReference(); appearance->setExtent( appearanceExtent ); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, second stanza.")); } } else @@ -247,6 +251,8 @@ void DoorObject::createAppearance ( DoorInfo const & info ) if (appearance != NULL) { m_drawnDoor[0]->setAppearance(appearance); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, third stanza.")); } } @@ -259,6 +265,8 @@ void DoorObject::createAppearance ( DoorInfo const & info ) if (appearance != NULL) { m_drawnDoor[1]->setAppearance(appearance); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for DoorObject::createAppearance missing, fourth stanza.")); } if (info.m_doorFlip2) diff --git a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp index abf1a9eb..ca474ac4 100755 --- a/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp +++ b/engine/shared/library/sharedObject/src/shared/appearance/AppearanceTemplateList.cpp @@ -399,10 +399,10 @@ Appearance *AppearanceTemplateList::createAppearance(const char *const fileName) //-- get the appearance template const AppearanceTemplate *const appearanceTemplate = fetch(fileName); -#ifdef _DEBUG +#ifdef _DEBUG //probably should modify the macro sometime to just be quiet if this isn't defined if (appearanceTemplate == NULL){ - DEBUG_WARNING(true, ("FIX ME: Appearance template for %s could not be fetched - is it missing?", fileName)); - return NULL; // Cekis: TODO: Figure out why the template can't be fetched. + DEBUG_WARNING(true, ("FIX ME: Appearance template for %s could not be fetched - is it missing?", fileName)); + return NULL; // Cekis: TODO: Figure out why the template can't be fetched. DarthArgus: always is due to a missing file or one of the redirectors having a bad path } DataLint::pushAsset(fileName); diff --git a/engine/shared/library/sharedObject/src/shared/object/Object.cpp b/engine/shared/library/sharedObject/src/shared/object/Object.cpp index 0adef266..73273e36 100755 --- a/engine/shared/library/sharedObject/src/shared/object/Object.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/Object.cpp @@ -2464,7 +2464,9 @@ void Object::setAppearanceByName(char const *path) if (appearance != NULL) { setAppearance(appearance); - } + } else { + DEBUG_WARNING(true, ("Object::setAppearanceByName() - Unable to find the object's appearance because the file does not exist: %s", path)); + } } else { @@ -3275,6 +3277,7 @@ void Object::setAlternateAppearance(const char * path) alternateAppearance = AppearanceTemplateList::createAppearance(path); if (alternateAppearance == NULL) { + DEBUG_WARNING(true, ("Object::setAlternateAppearance() - Unable to change the object's appearance because the file does not exist: %s", path)); return; } } diff --git a/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp b/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp index 8179b538..d6ae066b 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/CellProperty.cpp @@ -438,6 +438,8 @@ void CellProperty::initialize(const PortalProperty &portalProperty, int cellInde if (ms_addToRenderWorldHook) ms_addToRenderWorldHook(*m_appearanceObject); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template in CellProperty::initialize missing")); } } diff --git a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp index 8a99c3be..e88349e2 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp @@ -463,6 +463,8 @@ void PortalProperty::createAppearance() if (appearance != NULL) { appearance->setShadowBlobAllowed(); getOwner().setAppearance(appearance); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template for PortalProperty::createAppearance missing")); } } diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp b/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp index 26fcdab8..3aca2005 100755 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.cpp @@ -1200,6 +1200,8 @@ void ProceduralTerrainAppearance::_legacyCreateFlora(const Chunk* const chunk) object->addToWorld (); IGNORE_RETURN (m_floraMap->insert (std::make_pair (key, object))); + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template in ProceduralTerrainAppearance::_legacyCreateFlora is not found")); } } //lint !e429 //-- collisionProperty has not been freed or returned } @@ -1357,7 +1359,10 @@ void ProceduralTerrainAppearance::createFlora (const Chunk* const chunk) object->addToWorld (); IGNORE_RETURN (m_floraMap->insert (std::make_pair (key, object))); - } + } else { + DEBUG_WARNING(true, ("FIX ME: Appearance template in ProceduralTerrainAppearance::createFlora is not found")); + } + } //lint !e429 //-- collisionProperty has not been freed or returned }