MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Perform chdir(gameFolder) early in main()

Browse source
This commit is contained in:
Jonas Kulla 2014-12-23 19:15:13 +01:00
parent 03a6c657c4
commit fcfa079e7b
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main.cpp
View file

@ -206,8 +206,15 @@ int main(int argc, char *argv[])
/* now we load the config */ /* now we load the config */
Config conf; Config conf;
conf.read(argc, argv); conf.read(argc, argv);
if (!conf.gameFolder.empty())
if (chdir(conf.gameFolder.c_str()) != 0)
{
showInitError(std::string("Unable to switch into gameFolder ") + conf.gameFolder);
return 0;
}
conf.readGameINI(); conf.readGameINI();
assert(conf.rgssVersion >= 1 && conf.rgssVersion <= 3); assert(conf.rgssVersion >= 1 && conf.rgssVersion <= 3);

10
src/sharedstate.cpp
View file

@ -111,16 +111,6 @@ struct SharedStatePrivate
fontState(threadData->config), fontState(threadData->config),
stampCounter(0) stampCounter(0)
{ {
if (!config.gameFolder.empty())
{
int result = chdir(config.gameFolder.c_str());
if (result != 0)
throw Exception(Exception::MKXPError,
"Unable to switch into gameFolder '%s'",
config.gameFolder.c_str());
}
// FIXME find out correct archive filename // FIXME find out correct archive filename
std::string archPath = defGameArchive(); std::string archPath = defGameArchive();