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

Timestamp:

Mar 30, 2006, 11:45:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

File:

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

trunk/src/orxonox.h

@@ -11 +11 @@
 class WorldEntity;
 class GameLoader;
-class IniParser;
 
 //! orxonox core singleton class
@@ -23 +22 @@
   inline static Orxonox* getInstance() { if (!singletonRef) singletonRef = new Orxonox();  return singletonRef; };
 
-  int init(int argc, char** argv, const char* name, int port);
+  int init(int argc, char** argv, const std::string & name, int port);
 
   void restart();
@@ -31 +30 @@
  private:
   Orxonox ();
-
-  void parseIniFile(const std::string& fileName);
 
   int initResources ();
@@ -46 +43 @@
   static Orxonox*   singletonRef;            //!< singleton reference to orxonox
 
-  IniParser*        iniParser;               //!< Reference to the ini-parser used in orxonox
   std::string       configFileName;          //!< Filename of the configuration-file.
   GameLoader*       gameLoader;              //!< The gameLoader
@@ -53 +49 @@
   char**            argv;                    //!< Values of th Arguments of orxonox.
 
-  const char*       serverName;              //!< Name of the Orxonox client if == NULL -> server
+  std::string       serverName;              //!< Name of the Orxonox client if == "" -> server
   int               port;                    //!< number of the network port of the server/client if == -1 no network
 };
@@ -61 +57 @@
 // Start-up functions //
 ////////////////////////
-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);
+int startOrxonox(int argc, char** argv, const std::string & clientName, int port);
 
 #endif /* _ORXONOX_H */