Changeset 6351 in orxonox.OLD for branches/network/src/orxonox.h

Timestamp:

Dec 30, 2005, 1:55:51 PM (19 years ago)

Author:

patrick

Message:

network: the network initialisation is much better, working for dedicated server mode

File:

• branches/network/src/orxonox.h (modified) (5 diffs)

branches/network/src/orxonox.h

@@ -9 +9 @@
 #include "base_object.h"
 
-class WorldEntity;
 class GameLoader;
 class IniParser;
@@ -18 +17 @@
 class Orxonox : public BaseObject {
 
+
  public:
   virtual ~Orxonox ();
@@ -24 +24 @@
 
   int init(int argc, char** argv, const char* name, int port);
+  void start();
 
-  void restart();
-
-  void start();
 
  private:
   Orxonox ();
 
+  int initResources (int argc, char** argv);
+  int initVideo (int argc, char** argv);
+  int initSound (int argc, char** argv);
+  int initInput (int argc, char** argv);
+  int initNetworking (int argc, char** argv);
+  int initMisc (int argc, char** argv);
+
   void parseIniFile(const char* fileName);
+  const char* getConfigFile ();
 
-  int initResources ();
-  int initVideo ();
-  int initSound ();
-  int initInput ();
-  int initNetworking ();
-  int initMisc ();
-
-  const char* getConfigFile ();
 
  private:
@@ -54 +52 @@
 
   const char*       serverName;              //!< Name of the Orxonox client if == NULL -> server
+  int               dedicatedServer;         //!< is 1 if the server is a dedicated server, 0 else
   int               port;                    //!< number of the network port of the server/client if == -1 no network
 };
@@ -63 +62 @@
 int showHelp(int argc, char** argv);
 int showLicense();
-int startNetworkOrxonox(int argc, char** argv);
 int startOrxonox(int argc, char** argv, const char* clientName, int port);