new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS
svn-id: r10687
This commit is contained in:
parent
3c78c0929c
commit
d177364715
23 changed files with 910 additions and 805 deletions
|
@ -24,7 +24,7 @@
|
|||
#endif
|
||||
#include "base/engine.h"
|
||||
#include "base/gameDetector.h"
|
||||
#include "common/config-file.h"
|
||||
#include "common/config-manager.h"
|
||||
#include "common/timer.h"
|
||||
#include "sound/mixer.h"
|
||||
|
||||
|
@ -36,7 +36,7 @@ Engine::Engine(GameDetector *detector, OSystem *syst)
|
|||
g_engine = this;
|
||||
_mixer = detector->createMixer();
|
||||
|
||||
_gameDataPath = detector->_gameDataPath;
|
||||
_gameDataPath = strdup(ConfMan.get("path").c_str()); // FIXME - leak. Just conver to a String?
|
||||
|
||||
_timer = g_timer;
|
||||
}
|
||||
|
@ -61,11 +61,7 @@ const char *Engine::getSavePath() const {
|
|||
|
||||
// If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
|
||||
if (!dir || dir[0] == 0)
|
||||
dir = g_config->get("savepath");
|
||||
|
||||
// If SCUMMVM_SAVEPATH was not specified, try to use general path from config
|
||||
if (!dir || dir[0] == 0)
|
||||
dir = g_config->get("savepath", "scummvm");
|
||||
dir = ConfMan.get("savepath").c_str();
|
||||
|
||||
// If no save path was specified, use no directory prefix
|
||||
if (dir == NULL)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue