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

Timestamp:

May 26, 2005, 3:20:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

File:

• orxonox/branches/physics/src/orxonox.h (modified) (2 diffs)

orxonox/branches/physics/src/orxonox.h

@@ -16 +16 @@
 class GameLoader;
 class ResourceManager;
+class ObjectManager;
 
 //! Orxonox core singleton class
@@ -32 +33 @@
   GameLoader* gameLoader;     //!< The gameLoader
   ResourceManager* resourceManager; //!< The ResourceManager
+  ObjectManager* objectManager; //!< the object manager of the game
   
   bool bQuitOrxonox;          //!< If Orxonox should Quit