ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replaced instances of "fceux.cfg" with a variable std:string cfgFile

This commit is contained in:
adelikat 2008-10-13 16:09:13 +00:00
parent 05c61fa9b6
commit 89c8715548
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/common/configSys.cpp
View File

@ -6,6 +6,7 @@
#include "../../types.h"
#include "configSys.h"
std::string cfgFile = "fceux.cfg";
/**
* Add a given option. The option is specified as a short command
* line (-f), long command line (--foo), option name (Foo), its type
@ -582,7 +583,7 @@ Config::_load()
std::map<std::string, int>::iterator int_i;
std::map<std::string, double>::iterator dbl_i;
std::map<std::string, std::string>::iterator str_i;
std::string configFile = _dir + "/fceux.cfg";
std::string configFile = _dir + "/" + cfgFile;
std::string line, name, value;
char buf[1024];
@ -649,7 +650,7 @@ Config::save()
std::map<std::string, int>::iterator int_i;
std::map<std::string, double>::iterator dbl_i;
std::map<std::string, std::string>::iterator str_i;
std::string configFile = _dir + "/fceux.cfg";
std::string configFile = _dir + "/" + cfgFile;
char buf[1024];
// set the exception handling to catch i/o errors

8
src/drivers/win/main.cpp
View File

@ -95,7 +95,7 @@
#endif
// External functions
extern std::string cfgFile;
void ResetVideo(void);
void ShowCursorAbs(int w);
void HideFWindow(int h);
@ -432,7 +432,8 @@ int DriverInitialize()
static void DriverKill(void)
{
// Save config file
sprintf(TempArray, "%s/fceux.cfg", BaseDirectory.c_str());
//sprintf(TempArray, "%s/fceux.cfg", BaseDirectory.c_str());
sprintf(TempArray, "%s/%s", BaseDirectory.c_str(),cfgFile.c_str());
SaveConfig(TempArray);
DestroyInput();
@ -568,7 +569,8 @@ int main(int argc,char *argv[])
GetBaseDirectory();
// Load the config information
sprintf(TempArray,"%s\\fceux.cfg",BaseDirectory.c_str());
//sprintf(TempArray,"%s\\fceux.cfg",BaseDirectory.c_str());
sprintf(TempArray,"%s\\%s",BaseDirectory.c_str(),cfgFile.c_str());
LoadConfig(TempArray);
initDirectories();