Changeset 1035 for code/trunk/src/orxonox/objects

Timestamp:

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

Author:

rgrieder

Message:

• minor Singleton changes

File:

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

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -417 +417 @@
     void SpaceShip::tick(float dt)
     {
-      if (InputManager::getSingleton()->getMouse()->getEventCallback() != this)
-        {
-            if (InputManager::getSingleton()->getMouse())
+      if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
+        {
+            if (InputManager::getSingleton().getMouse())
             {
-                InputManager::getSingleton()->getMouse()->setEventCallback(this);
+                InputManager::getSingleton().getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -446 +446 @@
         }
 
-        OIS::Keyboard* mKeyboard = InputManager::getSingleton()->getKeyboard();
-        OIS::Mouse* mMouse = InputManager::getSingleton()->getMouse();
+        OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard();
+        OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();