Changeset 1647 for code/branches/gui/src/orxonox/gui/GUIManager.h

Timestamp:

Jul 27, 2008, 12:34:31 PM (16 years ago)

Author:

rgrieder

Message:

• removed Script_clean.h

File:

• code/branches/gui/src/orxonox/gui/GUIManager.h (modified) (2 diffs)

code/branches/gui/src/orxonox/gui/GUIManager.h

@@ -73 +73 @@
 
         bool initialise();
-        void tick(float dt);
+        void tick(float dt)
+        {
+            assert(guiSystem_);
+            guiSystem_->injectTimePulse(dt);
+        }
         void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export
         void _hideGUI(); // tolua_export
@@ -131 +135 @@
         static GUIManager*        singletonRef_s;
     }; // tolua_export
-
-    inline void GUIManager::tick(float dt)
-    {
-        assert(guiSystem_);
-        guiSystem_->injectTimePulse(dt);
-    }
 } // tolua_export