marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

C4Config: Save & Load -> same file

stable-5.1
Martin Plicht 2010-08-09 14:52:32 +02:00
parent 3e5f4deebb
commit 059f3f8bbe
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/config/C4Config.cpp
View File

@ -370,6 +370,29 @@ void C4Config::Default()
fConfigLoaded=false;
}
void C4Config::GetConfigFileName(StdStrBuf &filename, bool forceWorkingDirectory, const char *szConfigFile)
{
if (szConfigFile)
{
// Config filename is specified
filename.Ref(szConfigFile);
// make sure we're at the correct path to load it
if (forceWorkingDirectory) General.DeterminePaths(true);
}
else
{
// Config filename from home
StdStrBuf home(getenv("HOME"));
if (home) { home += "/"; }
filename.Copy(home);
#ifdef __APPLE__
filename += "Library/Preferences/" C4ENGINEID ".config";
#else
filename += ".clonk/" C4ENGINENICK "/config";
#endif
}
}
bool C4Config::Load(bool forceWorkingDirectory, const char *szConfigFile)
{
try
@ -386,25 +409,7 @@ bool C4Config::Load(bool forceWorkingDirectory, const char *szConfigFile)
{
// Nonwindows or explicit config file: Determine filename to load config from
StdStrBuf filename;
if (szConfigFile)
{
// Config filename is specified
filename.Ref(szConfigFile);
// make sure we're at the correct path to load it
if (forceWorkingDirectory) General.DeterminePaths(true);
}
else
{
// Config filename from home
StdStrBuf home(getenv("HOME"));
if (home) { home += "/"; }
filename.Copy(home);
#ifdef __APPLE__
filename += "Library/Preferences/" C4ENGINEID ".config";
#else
filename += ".clonk/" C4ENGINENICK "/config";
#endif
}
GetConfigFileName(filename, forceWorkingDirectory, szConfigFile);
// Load config file into buf
StdStrBuf buf;
@ -499,20 +504,7 @@ bool C4Config::Save()
#endif
{
StdStrBuf filename;
if (ConfigFilename.getLength())
{
filename.Ref(ConfigFilename);
}
else
{
filename.Copy(getenv("HOME"));
if (filename) { filename += "/"; }
#ifdef __APPLE__
filename += "Library/Preferences/de.clonk." C4ENGINENICK ".config";
#else
filename += ".clonk/" C4ENGINENICK "/config";
#endif
}
GetConfigFileName(filename, false, ConfigFilename.getLength() ? ConfigFilename.getData() : NULL);
StdCompilerINIWrite IniWrite;
IniWrite.Decompile(*this);
IniWrite.getOutput().SaveToFile(filename.getData());

1
src/config/C4Config.h
View File

@ -301,6 +301,7 @@ public:
bool RemoveModule(const char *szPath, char *szModules);
bool IsModule(const char *szPath, char *szModules);
bool AddModule(const char *szPath, char *szModules);
void GetConfigFileName(StdStrBuf &filename, bool forceWorkingDirectory, const char *szConfigFile);
static void ExpandEnvironmentVariables(char *strPath, size_t iMaxLen);
private: