swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-29 16:13:07 -04:00
Code Issues Projects Releases Wiki Activity

more null checks in places where we're calling createAppearance; some cleanup

Browse Source
This commit is contained in:
DarthArgus
2016-01-07 22:05:32 -06:00
parent 1ad5f8d882
commit 1d67bdd186
7 changed files with 95 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/core/GameServer.cpp
+6 -2
View File
@@ -835,12 +835,16 @@ void GameServer::loadTerrain ()
TerrainObject * const terrainObject = new TerrainObject(ServerWorld::getTerrainObjectNotification());
terrainObject->setDebugName("terrain");
Appearance * const appearance = AppearanceTemplateList::createAppearance(terrainFileName);
terrainObject->setAppearance(appearance);
if (appearance != NULL) {
terrainObject->setAppearance(appearance);
}
ProceduralTerrainAppearance * const proceduralTerrainAppearance = dynamic_cast<ProceduralTerrainAppearance *>(appearance);
if (proceduralTerrainAppearance)
if (proceduralTerrainAppearance) {
ServerObjectTerrainModificationNotification::setTerrainAppearance(proceduralTerrainAppearance);
}
terrainObject->addToWorld();
}