Changeset 2908 for code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSStandalone.cc (modified) (2 diffs)

code/branches/questsystem5/src/orxonox/gamestates/GSStandalone.cc

@@ -30 +30 @@
 #include "GSStandalone.h"
 
-#include <OgreViewport.h>
-#include <OgreCamera.h>
-#include "core/Game.h"
-#include "core/GameMode.h"
-#include "core/ConsoleCommand.h"
-#include "gui/GUIManager.h"
-#include "GraphicsManager.h"
+#include "core/Core.h"
 
 namespace orxonox
 {
-    AddGameState(GSStandalone, "standalone");
-
-    GSStandalone::GSStandalone(const std::string& name)
-        : GameState(name)
+    GSStandalone::GSStandalone()
+        : GameState<GSGraphics>("standalone")
     {
     }
@@ -51 +43 @@
     }
 
+    void GSStandalone::enter()
+    {
+        Core::setIsStandalone(true);
 
-    void GSStandalone::activate()
-    {
-        GameMode::setIsStandalone(true);
+        GSLevel::enter(this->getParent()->getViewport());
     }
 
-    void GSStandalone::deactivate()
+    void GSStandalone::leave()
     {
-        GameMode::setIsStandalone(false);
+        GSLevel::leave();
+
+        Core::setIsStandalone(false);
     }
 
-    void GSStandalone::update(const Clock& time)
+    void GSStandalone::ticked(const Clock& time)
     {
+        GSLevel::ticked(time);
+        this->tickChild(time);
     }
 }