Changeset 2908 for code/branches/questsystem5/src/orxonox/gamestates/GSClient.h

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/GSClient.h (modified) (1 diff)

code/branches/questsystem5/src/orxonox/gamestates/GSClient.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/GameState.h"
 #include "network/NetworkPrereqs.h"
+#include "GSLevel.h"
+#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSClient : public GameState
+    class _OrxonoxExport GSClient : public GameState<GSGraphics>, public GSLevel
     {
     public:
-        GSClient(const std::string& name);
+        GSClient();
         ~GSClient();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
 
     private:
+        void enter();
+        void leave();
+        void ticked(const Clock& time);
+
         Client* client_;
     };