Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/orxonox.cc

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

• orxonox/branches/physics/src/orxonox.cc (modified) (3 diffs)

orxonox/branches/physics/src/orxonox.cc

@@ -30 +30 @@
 
 #include "world.h"
-#include "data_tank.h"
 #include "command_node.h"
 #include "ini_parser.h"
@@ -56 +55 @@
 
   this->world = NULL;
-  this->resources = NULL;
   this->localinput = NULL;
 
@@ -72 +70 @@
   if( world != NULL) delete world;
   if( localinput != NULL) delete localinput;
-  if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
   delete ResourceManager::getInstance(); // deletes the Resource Manager