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

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.h (modified) (2 diffs)

orxonox/branches/physics/src/orxonox.h

@@ -12 +12 @@
 class CommandNode;
 class WorldEntity;
-class DataTank;
 class World;
 class Camera;
@@ -29 +28 @@
   char configfilename[256];   //!< Filename of the configuration-file.
   World* world;               //!< Reference to the current running world.
-  DataTank* resources;        //!< DataContainer
   CommandNode* localinput;    //!< Command Handler
   SDL_Surface* screen;        //!< The current Screen