Changeset 5996 in orxonox.OLD for trunk/src/orxonox.h

Timestamp:

Dec 9, 2005, 12:31:01 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: merged network branche into trunk with command svn merge -r 5824:HEAD

File:

• trunk/src/orxonox.h (modified) (4 diffs)

trunk/src/orxonox.h

@@ -23 +23 @@
   inline static Orxonox* getInstance() { if (!singletonRef) singletonRef = new Orxonox();  return singletonRef; };
 
-  int init (int argc, char** argv);
+  int init(int argc, char** argv, const char* name, int port);
 
   void restart();
 
   void start();
-
-  //void graphicsHandler (SDL_Event* event);
 
  private:
@@ -43 +41 @@
   int initMisc ();
 
-
   const char* getConfigFile ();
 
@@ -55 +52 @@
   unsigned int      argc;                    //!< Count of Arguments of orxonox
   char**            argv;                    //!< Values of th Arguments of orxonox.
+
+  const char*       serverName;              //!< Name of the Orxonox client if == NULL -> server
+  int               port;                    //!< number of the network port of the server/client if == -1 no network
 };
 
@@ -61 +61 @@
 // Start-up functions //
 ////////////////////////
-int startHelp(int argc, char** argv);
-int startOrxonox(int argc, char** argv);
+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);
 
 #endif /* _ORXONOX_H */