Changeset 7256 in orxonox.OLD for trunk

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

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/defs/class_id.h (modified) (1 diff)
• src/defs/globals.h (modified) (1 diff)
• src/lib/BuildLibs.am (modified) (1 diff)
• src/lib/Makefile.am (modified) (2 diffs)
• src/lib/event/event_handler.cc (modified) (1 diff)
• src/lib/event/event_handler.h (modified) (2 diffs)
• src/lib/event/key_mapper.cc (modified) (4 diffs)
• src/lib/event/key_mapper.h (modified) (1 diff)
• src/lib/graphics/graphics_engine.cc (modified) (3 diffs)
• src/lib/graphics/graphics_engine.h (modified) (2 diffs)
• src/lib/network/network_manager.cc (modified) (1 diff)
• src/lib/network/network_manager.h (modified) (1 diff)
• src/lib/parser/Makefile.am (modified) (1 diff)
• src/lib/parser/cmdline_parser (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser)
• src/lib/parser/cmdline_parser/Makefile.am (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/Makefile.am)
• src/lib/parser/cmdline_parser/cmdline_parser.cc (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.cc)
• src/lib/parser/cmdline_parser/cmdline_parser.h (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.h)
• src/lib/parser/ini_parser/ini_parser.cc (modified) (1 diff)
• src/lib/parser/ini_parser/ini_parser.h (modified) (1 diff)
• src/lib/parser/preferences (copied) (copied from branches/preferences/src/lib/parser/preferences)
• src/lib/parser/preferences/Makefile.am (copied) (copied from branches/preferences/src/lib/parser/preferences/Makefile.am)
• src/lib/parser/preferences/cmd_line_prefs_reader.cc (copied) (copied from branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc)
• src/lib/parser/preferences/cmd_line_prefs_reader.h (copied) (copied from branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.h)
• src/lib/parser/preferences/ini_file_prefs_reader.cc (copied) (copied from branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.cc)
• src/lib/parser/preferences/ini_file_prefs_reader.h (copied) (copied from branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.h)
• src/lib/sound/sound_engine.cc (modified) (2 diffs)
• src/lib/sound/sound_engine.h (modified) (1 diff)
• src/lib/util/preferences.cc (copied) (copied from branches/preferences/src/lib/util/preferences.cc)
• src/lib/util/preferences.h (copied) (copied from branches/preferences/src/lib/util/preferences.h)
• src/orxonox.cc (modified) (14 diffs)
• src/orxonox.h (modified) (6 diffs)
• src/subprojects/framework.cc (modified) (2 diffs)

trunk/AUTHORS

@@ -1 +1 @@
 orxonox-crew: <orxonox-dev@mail.datacore.ch>
 
+Maintainers:
 Patrick Boenzli <patrick@orxonox.ethz.ch>
 Benjamin Grauer <bensch@orxonox.ethz.ch>
+
+Developers:
+Christian Meyer
+David Gruetter
+
+Coders:
 Simon Hofmann
-David Gruetter
 Johannes Bader
 Adrian Buerli
-Christian Meyer
+
+

trunk/configure.ac

@@ -646 +646 @@
                  src/lib/parser/tinyxml/Makefile
                  src/lib/parser/ini_parser/Makefile
+                 src/lib/parser/cmdline_parser/Makefile
+                 src/lib/parser/preferences/Makefile
                  src/util/Makefile
                  src/world_entities/Makefile

trunk/src/defs/class_id.h

@@ -96 +96 @@
   CL_MASK_LOWLEVEL_CLASS        =    0x00000fff,
 
+  CL_PREFERENCES                =    0X00000f51,
 
   /// SINGLETON classes (range from 0x00000000 to 0x000000ff)

trunk/src/defs/globals.h

@@ -27 +27 @@
 #define   DEFAULT_DATA_DIR                 DATADIR "/orxonox/"
 #define   DEFAULT_DATA_DIR_CHECKFILE       "data.oxd"
+
+#define   DEFAULT_ORXONOX_PORT             9999
 
 // Defines all the Sections of the Config (in Gui and orxonox)

trunk/src/lib/BuildLibs.am

@@ -15 +15 @@
                 $(LIB_PREFIX)/graphics/spatial_separation/libORXquadtree.a \
                 $(LIB_PREFIX)/parser/tinyxml/libtinyxml.a \
+                $(LIB_PREFIX)/parser/preferences/libPrefsParser.a \
+                $(LIB_PREFIX)/parser/cmdline_parser/libCmdLineParser.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
-                $(LIB_PREFIX)/math/libORXmath.a
+                $(LIB_PREFIX)/math/libORXmath.a \
+                $(LIB_PREFIX)/libORXlibs.a

trunk/src/lib/Makefile.am

@@ -23 +23 @@
                 util/loading/factory.cc \
                 util/loading/dynamic_loader.cc \
+                util/preferences.cc \
                 \
                 data/data_tank.cc
@@ -39 +40 @@
                 util/executor/executor_specials.h \
                 util/executor/functor_list.h \
+                util/preferences.h \
                 \
                 util/loading/resource_manager.h \

trunk/src/lib/event/event_handler.cc

@@ -88 +88 @@
  * this has to be called before the use of the event handler
 */
-void EventHandler::init(IniParser* iniParser)
+void EventHandler::init()
 {
   if (this->keyMapper == NULL)
   {
     this->keyMapper = new KeyMapper();
-    this->keyMapper->loadKeyBindings(iniParser);
+    this->keyMapper->loadKeyBindings();
   }
 }

trunk/src/lib/event/event_handler.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class EventListener;
-class IniParser;
 
 //! The one Event Handler from Orxonox
@@ -24 +23 @@
   /** @returns a Pointer to the only object of this Class */
   inline static EventHandler* getInstance() { if (!singletonRef) singletonRef = new EventHandler();  return singletonRef; };
-  void init(IniParser* iniParser);
+  void init();
 
   /** @param state: to which the event handler shall change */

trunk/src/lib/event/key_mapper.cc

@@ -25 +25 @@
 #include "globals.h"
 #include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "key_names.h"
 #include "debug.h"
@@ -145 +146 @@
 
   iniParser->firstVar();
-  while(iniParser->getCurrentName() != "")
+  while( iniParser->getCurrentName() != "" )
   {
     PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
@@ -164 +165 @@
 
   iniParser->firstVar();
-  while(iniParser->getCurrentName() != "")
+  while( iniParser->getCurrentName() != "" )
   {
     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
@@ -170 +171 @@
     this->mapKeys(iniParser->getCurrentName(), index);
     iniParser->nextVar();
+  }
+}
+
+void KeyMapper::loadKeyBindings()
+{
+  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_PLAYER "1"))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
+    return;
+  }
+  int* index;
+
+  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_PLAYER "1");
+  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
+  {
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, "").c_str());
+    // map the name to an sdl index
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, ""));
+    // map the index to a internal name
+    this->mapKeys(*it, index);
+  }
+
+
+  // PARSE MISC SECTION
+  if( !Preferences::getInstance()->sectionExists (CONFIG_SECTION_MISC_KEYS))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_MISC_KEYS "\n");
+    return;
+  }
+
+  keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_MISC_KEYS);
+  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
+  {
+    PRINTF(3)("MISC: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, "").c_str());
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, ""));
+    this->mapKeys(*it, index);
   }
 }

trunk/src/lib/event/key_mapper.h

@@ -29 +29 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const std::string& fileName = "" );
+  void loadKeyBindings(const std::string& fileName );
+  void loadKeyBindings();
   void loadKeyBindings(IniParser* iniParser);
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -29 +29 @@
 #include "debug.h"
 
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "substring.h"
 #include "text.h"
@@ -150 +150 @@
 /**
  * loads the GraphicsEngine's settings from a given ini-file and section
- * @param iniParser the iniParser to load from
- * @param section the Section in the ini-file to load from
  * @returns nothing usefull
  */
-int GraphicsEngine::initFromIniFile(IniParser* iniParser)
+int GraphicsEngine::initFromPreferences()
 {
   // looking if we are in fullscreen-mode
-  const std::string fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
+  const std::string fullscreen = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_FULLSCREEN, "0");
+
   if (fullscreen[0] == '1' || fullscreen == "true")
     this->fullscreenFlag = SDL_FULLSCREEN;
 
   // looking if we are in fullscreen-mode
-  const std::string textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
+  const std::string textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "0");
   if (textures[0] == '1' || textures == "true")
     Texture::setTextureEnableState(true);
@@ -169 +168 @@
 
   // searching for a usefull resolution
-  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480").c_str(), 'x'); ///FIXME
+  SubString resolution(Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_RESOLUTION, "640x480").c_str(), 'x'); ///FIXME
   //resolution.debug();
   MultiType x = resolution.getString(0), y = resolution.getString(1);

trunk/src/lib/graphics/graphics_engine.h

@@ -20 +20 @@
 // Forward Declaration
 class Text;
-class IniParser;
 class WorldEntity;
 class GraphicsEffect;
@@ -39 +38 @@
 
     int init();
-    int initFromIniFile(IniParser* iniParser);
+    int initFromPreferences();
 
     void setWindowName(const std::string& windowName, const std::string& icon);

trunk/src/lib/network/network_manager.cc

@@ -88 +88 @@
  * @param hostName: the name of the destination host
  */
-int NetworkManager::establishConnection(const char* name, unsigned int port)
+int NetworkManager::establishConnection(const std::string & name, unsigned int port)
 {
   IPaddress ipAddress;
-  int error = SDLNet_ResolveHost(&ipAddress, name, port);
+  int error = SDLNet_ResolveHost(&ipAddress, name.c_str(), port);
   if( error == -1) {
     printf("\n\nerror on address resolution, program inconsistency\n\n");

trunk/src/lib/network/network_manager.h

@@ -36 +36 @@
     void shutdown();
 
-    int establishConnection(const char* name, unsigned int port);
+    int establishConnection( const std::string & name, unsigned int port);
     int createServer(unsigned int port);
 

trunk/src/lib/parser/Makefile.am

@@ -1 +1 @@
 SUBDIRS = \
           tinyxml \
-          ini_parser
+          ini_parser \
+          preferences \
+          cmdline_parser
 
 

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -392 +392 @@
 }
 
+/**
+ * @brief edits the entry speciefied by entryName in sectionName/currentSection or creates it if it doesn't exist
+ * @param entryName the Name of the Entry to add
+ * @param value the value to assign to this entry
+ * @param sectionName if NULL then this entry will be set to the currentSection
+ * otherwise to the section refered to by sectionName.
+ * If both are NULL no entry will be added
+ * @return true if everything is ok false on error
+ */
+bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName)
+{
+  std::list<IniSection>::iterator section;
+
+  if (!sectionName.empty())
+  {
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if ((*section).name == sectionName)
+        break;
+  }
+  else
+    section = this->currentSection;
+
+  if (section == this->sections.end())
+  {
+    IniSection sec;
+    sec.comment = "";
+    sec.name = sectionName;
+    section = this->sections.insert(this->sections.end(), sec);
+  }
+
+  if (section == this->sections.end())
+  {
+    PRINTF(2)("section '%s' not found for value '%s'\n", sectionName.c_str(), entryName.c_str());
+    return false;
+  }
+  else
+  {
+    //try find item
+    std::list<IniEntry>::iterator entry;
+    for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
+      if (entry->name == entryName )
+        break;
+
+    //found it?
+    if ( entry != section->entries.end() )
+    {
+      entry->value = value;
+
+      return true;
+    }
+
+    //not found -> create it
+    (*section).entries.push_back(IniEntry());
+    (*section).entries.back().comment = "";
+    (*section).entries.back().name = entryName;
+    (*section).entries.back().value = value;
+    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
+    (*section).entries.back().name.c_str(),
+    (*section).entries.back().value.c_str(),
+    (*section).name);
+    this->currentEntry = --(*section).entries.end();
+    return true;
+  }
+}
+
 
 /**

trunk/src/lib/parser/ini_parser/ini_parser.h

@@ -69 +69 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
+    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "");
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;

trunk/src/lib/sound/sound_engine.cc

@@ -26 +26 @@
 #include "util/loading/resource_manager.h"
 #include "debug.h"
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "globals.h"
 
@@ -95 +95 @@
 /**
  * loads the settings of the SoundEngine from an ini-file
- * @param iniParser the IniParser of the inifile
  */
-void SoundEngine::loadSettings(IniParser* iniParser)
-{
-  MultiType channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
+void SoundEngine::loadSettings()
+{
+  MultiType channels = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_AUDIO_CHANNELS, "32");
   this->maxSourceCount = channels.getInt();
 
-  MultiType effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
+  MultiType effectsVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_EFFECTS_VOLUME, "80");
   this->effectsVolume = effectsVolume.getFloat()/100.0;
 
-  MultiType musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");
+  MultiType musicVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_MUSIC_VOLUME, "75");
   this->musicVolume = musicVolume.getFloat()/100.0;
 }

trunk/src/lib/sound/sound_engine.h

@@ -31 +31 @@
     inline static SoundEngine* getInstance() { if (!SoundEngine::singletonRef) SoundEngine::singletonRef = new SoundEngine();  return SoundEngine::singletonRef; };
 
-    void loadSettings(IniParser* iniParser);
+    void loadSettings();
 
     SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);

trunk/src/orxonox.cc

@@ -58 +58 @@
 
 #include "state.h"
-
+#include "lib/parser/preferences/cmd_line_prefs_reader.h"
+#include "lib/parser/preferences/ini_file_prefs_reader.h"
 #include <string.h>
 
@@ -66 +67 @@
 
 SHELL_COMMAND(restart, Orxonox, restart);
+
+REGISTER_ARG_FLAG( l, license, "misc", "showLicenseAndExit", "Prints the licence and exit",    "1" );
+REGISTER_ARG_FLAG( c, client,  "game", "gameType",           "Connect to Server (-H)",         "multiplayer_client" );
+REGISTER_ARG_FLAG( s, server,  "game", "gameType",           "Start Orxonox as Game Server",   "multiplayer_server" );
+REGISTER_ARG_ARG(  H, host,    "game", "host",               "Host to connect to",             "host");
+REGISTER_ARG_ARG(  p, port,    "game", "port",               "Port to use",                    "port" );
+REGISTER_ARG_FLAG( g, gui,     "game", "showGui",            "starts the orxonox with the configuration GUI", "1");
 
 /**
@@ -77 +85 @@
   this->setName("orxonox-main");
 
-  this->iniParser = NULL;
-
   this->argc = 0;
   this->argv = NULL;
 
   /* this way, there is no network enabled: */
-  this->serverName = NULL;
+  this->serverName = "";
   this->port = -1;
 
@@ -114 +120 @@
   // output-buffer
   delete ShellBuffer::getInstance();
-
-  // orxonox class-stuff
-  delete this->iniParser;
 
   SDL_QuitSubSystem(SDL_INIT_TIMER);
@@ -175 +178 @@
   else
     this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
-  this->iniParser = new IniParser(this->configFileName);
+
   PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
 }
@@ -182 +185 @@
  * initialize Orxonox with command line
  */
-int Orxonox::init (int argc, char** argv, const char* name, int port)
+int Orxonox::init (int argc, char** argv, const std::string & name, int port)
 {
   this->argc = argc;
@@ -227 +230 @@
   GraphicsEngine::getInstance();
 
-  GraphicsEngine::getInstance()->initFromIniFile(this->iniParser);
+  GraphicsEngine::getInstance()->initFromPreferences();
 
   std::string iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
@@ -247 +250 @@
   SoundEngine::getInstance();
 
-  SoundEngine::getInstance()->loadSettings(this->iniParser);
+  SoundEngine::getInstance()->loadSettings();
   SoundEngine::getInstance()->initAudio();
   return 0;
@@ -260 +263 @@
   PRINT(3)("> Initializing input\n");
 
-  EventHandler::getInstance()->init(this->iniParser);
+  EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
 
@@ -274 +277 @@
   PRINT(3)("> Initializing networking\n");
 
-  if( this->serverName != NULL) // we are a client
+  if( this->serverName != "") // we are a client
   {
     State::setOnline(true);
@@ -299 +302 @@
   // init the resource manager
   std::string dataPath;
-  if ((dataPath = this->iniParser->getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= "")
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= "")
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
@@ -403 +406 @@
 int main(int argc, char** argv)
 {
-  int i;
-  for(i = 1; i < argc; ++i)
-  {
-    if(     !strcmp( "--help", argv[i])     || !strcmp("-h", argv[i]))
-      return showHelp(argc, argv);
-    else if(!strcmp( "--gui", argv[i])      || !strcmp("-g", argv[i]))
-      showGui = true;
-    else if(!strcmp( "--client", argv[i])   || !strcmp("-c", argv[i]))
-      return startNetworkOrxonox(argc, argv);
-    else if(!strcmp( "--server", argv[i])   || !strcmp("-s", argv[i]))
-      return startNetworkOrxonox(argc, argv);
-    else if(!strcmp( "--license", argv[i])  || !strcmp("-l", argv[i]))
-      return PRINT(0)(ORXONOX_LICENSE_SHORT);
-  }
-
-  return startOrxonox(argc, argv, NULL, -1);
-}
-
-
-
-int showHelp(int argc, char** argv)
-{
-  PRINT(0)("Orxonox Version %s\n", PACKAGE_VERSION);
-  PRINT(0)(" Starts Orxonox - The most furious 3D Action Game :)\n");
-  PRINT(0)("\n");
-  PRINT(0)("Common options:\n");
-  PRINT(0)(" -g, --gui                        starts the orxonox with the configuration GUI \n");
-  PRINT(0)(" -h, --help                       shows this help\n");
-  PRINT(0)("\n");
-  PRINT(0)("Network options:\n");
-  PRINT(0)(" -s, --server [port]              starts Orxonox and listens on the [port] for players\n");
-  PRINT(0)(" -c, --client [hostname] [port]   starts Orxonox as a Client\n");
-  PRINT(0)(" -c, --client [ip address] [port] starts Orxonox as a Client\n");
-  PRINT(0)("\n");
-  PRINT(0)("Other options:\n");
-  PRINT(0)("     --license     prints the licence and exit\n\n");
-  PRINT(0)("\n");
-
-  //   {
-  //     Gui* gui = new Gui(argc, argv);
-  //     gui->printHelp();
-  //     delete gui;
-  //   }
-}
-
+  CmdLinePrefsReader prefs;
+  
+  IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
+  
+  prefs.parse(argc, argv);
+  
+  if ( Preferences::getInstance()->getString("misc", "showLicenseAndExit", "") == "1" )
+  {
+    PRINT(0)(ORXONOX_LICENSE_SHORT);
+    return 0;
+  }
+  
+  if( Preferences::getInstance()->getString("game", "showGui", "") == "1" )
+    showGui = true;
+  else if( Preferences::getInstance()->getString( "game", "gameType", "" ) == "multiplayer_server" ||
+           Preferences::getInstance()->getString( "game", "gameType", "" ) == "multiplayer_client" )
+    return startNetworkOrxonox(argc, argv);
+  
+  return startOrxonox(argc, argv, "", -1);
+  return 0;
+}
 
 
@@ -459 +438 @@
 {
 
-  int i;
-  for(i = 0; i < argc; ++i )
-  {
-    if( !strcmp( "--client", argv[i]) || !strcmp("-c", argv[i]))
+  std::string gameType = Preferences::getInstance()->getString( "game", "gameType", "" );
+  
+  if ( gameType == "multiplayer_client" )
+  {
+    int port = Preferences::getInstance()->getInt( "game", "port", DEFAULT_ORXONOX_PORT );
+    std::string host = Preferences::getInstance()->getString( "game", "host", "" );
+    
+    if ( host == "" )
     {
-      if( argc <= (i+2))
-      {
-        printf(" Wrong arguments try following notations:\n");
-        printf("   --client [server ip address] [port number]\n");
-        printf("   --client [dns name] [port number]\n");
-        return 0;
-      }
-
-      const char* name = argv[i+1];
-      int port = atoi(argv[i+2]);
-      printf("Starting Orxonox as client: connecting to %s, on port %i\n", name, port);
-
-      startOrxonox(argc, argv, name, port);
+      printf("You need to specify a host to connect to ( -H <host> )\n");
+      return 1;
     }
-    else if( !strcmp( "--server", argv[i]) || !strcmp("-s", argv[i]))
-    {
-      if( argc <= (i+1))
-      {
-        printf(" Wrong arguments try following notations:\n");
-        printf("   --server [port number]\n");
-        return 0;
-      }
-
-      int port = atoi(argv[i+1]);
-      printf("Starting Orxonox as server, listening on port %i\n", port);
-
-      startOrxonox(argc, argv, NULL, port);
-    }
+    
+    printf("Starting Orxonox as client: connecting to %s, on port %i\n", host.c_str(), port);
+    
+    startOrxonox(argc, argv, host.c_str(), port);
+  }
+  else if ( gameType == "multiplayer_server" )
+  {
+    int port = Preferences::getInstance()->getInt( "game", "port", DEFAULT_ORXONOX_PORT );
+    
+    printf("Starting Orxonox as server: listening on port %i\n", port);
+    
+    startOrxonox(argc, argv, "", port);
   }
 }
@@ -502 +472 @@
  * @param argv parameters given to orxonox
  */
-int startOrxonox(int argc, char** argv, const char* name, int port)
+int startOrxonox(int argc, char** argv, const std::string & name, int port)
 {
   // checking for existence of the configuration-files, or if the lock file is still used

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 */

trunk/src/subprojects/framework.cc

@@ -23 +23 @@
 #include "util/loading/resource_manager.h"
 #include "camera.h"
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "globals.h"
 
@@ -30 +30 @@
 void Framework::init(void)
 {
-  // create parser
-  char* configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
-
-  IniParser iniParser (configFileName);
-  delete configFileName;
-
-  GraphicsEngine::getInstance()->initFromIniFile(&iniParser);
+  GraphicsEngine::getInstance()->initFromPreferences();
 
   LightManager::getInstance();
 
   const char* dataPath;
-  if ((dataPath = iniParser.getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= NULL)
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= NULL)
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath))