Changeset 868 for code/branches/network/src/orxonox/Orxonox.h

Timestamp:

Mar 6, 2008, 4:45:49 PM (16 years ago)

Author:

scheusso

Message:

some changes

File:

• code/branches/network/src/orxonox/Orxonox.h (modified) (3 diffs)

code/branches/network/src/orxonox/Orxonox.h

@@ -27 +27 @@
     STANDALONE,
     SERVER,
-    CLIENT,
-    PRESENTATION
+    CLIENT
   };
 
+  union OrxListener{
+    OrxListenerClient *client;
+    OrxListenerServer *server;
+    OrxListenerStandalone *standalone;
+  };
+  
   class _OrxonoxExport Orxonox
   {
@@ -50 +55 @@
       virtual ~Orxonox();
       // init functions
+      void startStandalone();
+      void startServer();
+      void startClient();
       void serverInit(std::string path);
       void clientInit(std::string path);
@@ -76 +84 @@
       OIS::Mouse*           mouse_;
       OIS::InputManager*    inputManager_;
-      OrxListener*          frameListener_;
+      OrxListener          frameListener_;
       Ogre::Root*           root_;