Changeset 1035 for code/trunk/src/orxonox/Orxonox.cc

Timestamp:

Apr 12, 2008, 11:23:32 PM (16 years ago)

Author:

rgrieder

Message:

• minor Singleton changes

File:

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

code/trunk/src/orxonox/Orxonox.cc

@@ -113 +113 @@
       delete this->orxonoxHUD_;
     Loader::close();
-    InputManager::destroySingleton();
+    InputManager::getSingleton().destroy();
     if (this->auMan_)
       delete this->auMan_;
@@ -329 +329 @@
   void Orxonox::setupInputSystem()
   {
-    inputHandler_ = InputManager::getSingleton();
+    inputHandler_ = &InputManager::getSingleton();
     if (!inputHandler_->initialise(ogre_->getWindowHandle(),
           ogre_->getWindowWidth(), ogre_->getWindowHeight()))