Changeset 2023 for code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.h

Timestamp:

Oct 27, 2008, 10:56:51 PM (16 years ago)

Author:

rgrieder

Message:

• Added support for dedicated server. Could not network test it yet, client still segfaults me.
• Also kicked GraphicsEngine::levelSceneManager_, there are only the statistic methods left.
• GSDedicated also derives from GSLevel, but GSLevel is not anymore a real GameState.
• CameraHandler and LevelManager get created in GSLevel now.

File:

• code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.h (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "network/NetworkPrereqs.h"
+#include "GSLevel.h"
 #include "GSRoot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSDedicated : public GameState<GSRoot>
+    class _OrxonoxExport GSDedicated : public GameState<GSRoot>, public GSLevel
     {
     public:
         GSDedicated();
         ~GSDedicated();
-
-        void setTimeFactor(float factor);
-        float getTimeFactor() { return this->timeFactor_; }
 
     private:
@@ -50 +48 @@
         void ticked(const Clock& time);
 
-        void loadLevel();
-        void unloadLevel();
-
-        float                 timeFactor_;       //!< A factor to change the gamespeed
         network::Server*      server_;
-        Ogre::SceneManager*   sceneManager_;
-        XMLFile*              startFile_;        //!< current hard coded default level
     };
 }