load config file

Signed-off-by: Vincent-FK <[email protected]>

Author: Vincent-FK

src/drivers/common/configSys.cpp

@@ -543,21 +543,25 @@ Config::_parseArgs(int argc,
 
 
 /**
- * Parses first the configuration file, and then overrides with any
- * command-line options that were specified.
+ * Parses the configuration file
  */
 int
-Config::parse(int argc,
-              char **argv)
+Config::load()
 {
-    int error;
 
     // read the config file
-    error = _load();
-    if(error) {
-        return error;
+    return _load();
     }
 
+
+/**
+ * Parses command-line options that were specified.
+ */
+int
+Config::parse(int argc,
+              char **argv)
+{
+
     // parse the arguments
     return _parseArgs(argc, argv);
 }

src/drivers/common/configSys.h

@@ -76,7 +76,13 @@ class Config {
     int getOption(const std::string &, double *);
 
     /**
-     * Parse the arguments.  Also read in the configuration file and
+     * read in the configuration file and
+     * set the variables accordingly.
+     */
+    int load();
+
+    /**
+     * Parse the arguments and
      * set the variables accordingly.
      */
     int parse(int, char **);

src/drivers/dingux-sdl/config.cpp

@@ -228,6 +228,10 @@ Config * InitConfig() {
 	// fm2 -> srt conversion
 	config->addOption("ripsubs", "SDL.RipSubs", "");
 
+	// load from save file
+	config->addOption("loadStateFile", "SDL.loadStateFile", "");
+	config->setOption("SDL.loadStateFile", "");
+
 	// enable new PPU core
 	config->addOption("newppu", "SDL.NewPPU", 0);
 

src/drivers/dingux-sdl/dingoo.cpp

@@ -570,6 +570,8 @@ int main(int argc, char *argv[]) {
 		return -1;
 	}
 
+	/* Load config from file */
+	g_config->load();
 	int romIndex = g_config->parse(argc, argv);
 
 	// This is here so that a default fceux.cfg will be created on first