Changeset 6815 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jan 28, 2006, 5:11:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

File:

• trunk/src/story_entities/game_world_data.cc (modified) (1 diff)

trunk/src/story_entities/game_world_data.cc

@@ -278 +278 @@
 {
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
+  LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams);
 
 //  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);