Changeset 6142 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/orxonox.cc (modified) (2 diffs)

trunk/src/orxonox.cc

@@ -43 +43 @@
 #include "text_engine.h"
 #include "event_handler.h"
-#include "garbage_collector.h"
 
 #include "factory.h"
@@ -96 +95 @@
   // game-specific
   delete GameLoader::getInstance();
-  delete GarbageCollector::getInstance();
 
   // class-less services/factories