thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure our config default values get properly registered

Browse source 
svn-id: r22345
This commit is contained in:
Max Horn 2006-05-04 22:55:15 +00:00
parent 6321cfc874
commit c46301bcc2
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/gameDetector.cpp
View file

@ -150,7 +150,7 @@ static void usage(const char *s, ...) {
exit(1); exit(1);
} }
GameDetector::GameDetector() { void GameDetector::registerDefaults() {
// Graphics // Graphics
ConfMan.registerDefault("fullscreen", false); ConfMan.registerDefault("fullscreen", false);

4
base/gameDetector.h
View file

@ -35,8 +35,8 @@ class GameDetector {
typedef Common::String String; typedef Common::String String;
public: public:
GameDetector(); static void registerDefaults();
static Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv); static Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
static void processSettings(Common::String &target, Common::StringMap &settings); static void processSettings(Common::String &target, Common::StringMap &settings);
static const Plugin *detectMain(); static const Plugin *detectMain();

3
base/main.cpp
View file

@ -323,6 +323,9 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
// Verify that the backend has been initialized (i.e. g_system has been set). // Verify that the backend has been initialized (i.e. g_system has been set).
assert(g_system); assert(g_system);
OSystem &system = *g_system; OSystem &system = *g_system;
// Register config manager defaults
GameDetector::registerDefaults();
// Parse the command line // Parse the command line
Common::StringMap settings; Common::StringMap settings;