[Scummvm-cvs-logs] SF.net SVN: scummvm:[33603] residual/trunk/engine

[aquadran at users.sourceforge.net]

Revision: 33603
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33603&view=rev
Author:   aquadran
Date:     2008-08-04 10:46:33 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
fixed command line options, please remove config to cleanup a small mess

Modified Paths:
--------------
    residual/trunk/engine/cmd_line.cpp
    residual/trunk/engine/main.cpp
    residual/trunk/engine/registry.cpp

Modified: residual/trunk/engine/cmd_line.cpp
===================================================================
--- residual/trunk/engine/cmd_line.cpp	2008-08-04 02:37:54 UTC (rev 33602)
+++ residual/trunk/engine/cmd_line.cpp	2008-08-04 10:46:33 UTC (rev 33603)
@@ -116,27 +116,26 @@
 
 void registerDefaults() {
 	// Sound & Music
-	ConfMan.registerDefault("music-volume", 127);
-	ConfMan.registerDefault("sfx-volume", 127);
-	ConfMan.registerDefault("speech-volume", 127);
+	ConfMan.registerDefault("music_volume", 127);
+	ConfMan.registerDefault("sfx_volume", 127);
+	ConfMan.registerDefault("speech_volume", 127);
 
 	// Game specific
 	ConfMan.registerDefault("path", ".");
-	ConfMan.registerDefault("savepath", "");
 
-	ConfMan.registerDefault("boot-param", "");
-	ConfMan.registerDefault("text-speed", "7");
-	ConfMan.registerDefault("speech-mode", "3");
+	ConfMan.registerDefault("boot_param", "");
+	ConfMan.registerDefault("text_speed", "7");
+	ConfMan.registerDefault("speech_mode", "3");
 	ConfMan.registerDefault("transcript", "TRUE");
-	ConfMan.registerDefault("game-devel-mode", "TRUE");
+	ConfMan.registerDefault("game_devel_mode", "TRUE");
 	ConfMan.registerDefault("joystick", "TRUE");
 	ConfMan.registerDefault("movement", "Character");
 	ConfMan.registerDefault("gamma", "1.0");
 
 	// Miscellaneous
-	ConfMan.registerDefault("show-fps", "TRUE");
-	ConfMan.registerDefault("gl-zbuffer", "TRUE");
-	ConfMan.registerDefault("soft-renderer", "TRUE");
+	ConfMan.registerDefault("show_fps", "TRUE");
+	ConfMan.registerDefault("gl_zbuffer", "TRUE");
+	ConfMan.registerDefault("soft_renderer", "TRUE");
 	ConfMan.registerDefault("fullscreen", "FALSE");
 
 	ConfMan.registerDefault("disable_sdl_parachute", false);

Modified: residual/trunk/engine/main.cpp
===================================================================
--- residual/trunk/engine/main.cpp	2008-08-04 02:37:54 UTC (rev 33602)
+++ residual/trunk/engine/main.cpp	2008-08-04 10:46:33 UTC (rev 33603)
@@ -96,9 +96,9 @@
 
 	g_registry = new Registry();
 
-	SHOWFPS_GLOBAL = (tolower(g_registry->get("show-fps", "FALSE")[0]) == 't');
-	TINYGL_GLOBAL = (tolower(g_registry->get("soft-renderer", "FALSE")[0]) == 't');
-	ZBUFFER_GLOBAL = (tolower(g_registry->get("gl-zbuffer", "FALSE")[0]) == 't');
+	SHOWFPS_GLOBAL = (tolower(g_registry->get("show_fps", "FALSE")[0]) == 't');
+	TINYGL_GLOBAL = (tolower(g_registry->get("soft_renderer", "FALSE")[0]) == 't');
+	ZBUFFER_GLOBAL = (tolower(g_registry->get("gl_zbuffer", "FALSE")[0]) == 't');
 	bool fullscreen = (tolower(g_registry->get("fullscreen", "FALSE")[0]) == 't');
 
 	if (SDL_Init(SDL_INIT_EVERYTHING) < 0)

Modified: residual/trunk/engine/registry.cpp
===================================================================
--- residual/trunk/engine/registry.cpp	2008-08-04 02:37:54 UTC (rev 33602)
+++ residual/trunk/engine/registry.cpp	2008-08-04 10:46:33 UTC (rev 33603)
@@ -47,29 +47,29 @@
 // LastSavedGame
 // good_times
 
-// show-fps
-// gl-zbuffer
-// soft-renderer
+// show_fps
+// gl_zbuffer
+// soft_renderer
 // fullscreen
 
 Registry::Registry() : _dirty(true) {
-	_develMode = ConfMan.get("game-devel-mode");
+	_develMode = ConfMan.get("game_devel_mode");
 	_dataPath = ConfMan.get("path");
-	_lastSet = ConfMan.get("last-set");
-	_musicVolume = ConfMan.get("music-volume");
-	_sfxVolume = ConfMan.get("sfx-volume");
-	_voiceVolume = ConfMan.get("voice-volume");
-	_lastSavedGame = ConfMan.get("last-saved-game");
+	_lastSet = ConfMan.get("last_set");
+	_musicVolume = ConfMan.get("music_volume");
+	_sfxVolume = ConfMan.get("sfx_volume");
+	_voiceVolume = ConfMan.get("voice_volume");
+	_lastSavedGame = ConfMan.get("last_saved_game");
 	_gamma = ConfMan.get("gamma");
-	_voiceEffects = ConfMan.get("voice-effects");
-	_textSpeed = ConfMan.get("text-speed");
-	_speechMode = ConfMan.get("speech-mode");
+	_voiceEffects = ConfMan.get("voice_effects");
+	_textSpeed = ConfMan.get("text_speed");
+	_speechMode = ConfMan.get("speech_mode");
 	_movement = ConfMan.get("movement");
 	_joystick = ConfMan.get("joystick");
-	_spewOnError = ConfMan.get("spew-on-error");
-	_showFps = ConfMan.get("show-fps");
-	_softRenderer = ConfMan.get("soft-renderer");
-	_glZbuffer = ConfMan.get("gl-zbuffer");
+	_spewOnError = ConfMan.get("spew_on_error");
+	_showFps = ConfMan.get("show_fps");
+	_softRenderer = ConfMan.get("soft_renderer");
+	_glZbuffer = ConfMan.get("gl_zbuffer");
 	_fullscreen = ConfMan.get("fullscreen");
 }
 
@@ -102,11 +102,11 @@
 		return _joystick.c_str();
 	} else if (strcasecmp("SpewOnError", key) == 0) {
 		return _spewOnError.c_str();
-	} else if (strcasecmp("show-fps", key) == 0) {
+	} else if (strcasecmp("show_fps", key) == 0) {
 		return _showFps.c_str();
-	} else if (strcasecmp("soft-renderer", key) == 0) {
+	} else if (strcasecmp("soft_renderer", key) == 0) {
 		return _softRenderer.c_str();
-	} else if (strcasecmp("gl-zbuffer", key) == 0) {
+	} else if (strcasecmp("gl_zbuffer", key) == 0) {
 		return _glZbuffer.c_str();
 	} else if (strcasecmp("fullscreen", key) == 0) {
 		return _fullscreen.c_str();
@@ -166,13 +166,13 @@
 	} else if (strcasecmp("SpewOnError", key) == 0) {
 		_spewOnError = val;
 		return;
-	} else if (strcasecmp("show-fps", key) == 0) {
+	} else if (strcasecmp("show_fps", key) == 0) {
 		_showFps = val;
 		return;
-	} else if (strcasecmp("soft-renderer", key) == 0) {
+	} else if (strcasecmp("soft_renderer", key) == 0) {
 		_softRenderer = val;
 		return;
-	} else if (strcasecmp("gl-zbuffer", key) == 0) {
+	} else if (strcasecmp("gl_zbuffer", key) == 0) {
 		_glZbuffer = val;
 		return;
 	} else if (strcasecmp("fullscreen", key) == 0) {
@@ -185,23 +185,23 @@
 	if (!_dirty)
 		return;
 
-	ConfMan.set("game-devel-mode", _develMode);
+	ConfMan.set("game_devel_mode", _develMode);
 	ConfMan.set("path", _dataPath);
-	ConfMan.set("last-set", _lastSet);
-	ConfMan.set("music-volume", _musicVolume);
-	ConfMan.set("sfx-volume", _sfxVolume);
-	ConfMan.set("voice-volume", _voiceVolume);
-	ConfMan.set("last-saved-game", _lastSavedGame);
+	ConfMan.set("last_set", _lastSet);
+	ConfMan.set("music_volume", _musicVolume);
+	ConfMan.set("sfx_volume", _sfxVolume);
+	ConfMan.set("voice_volume", _voiceVolume);
+	ConfMan.set("last_saved_game", _lastSavedGame);
 	ConfMan.set("gamma", _gamma);
-	ConfMan.set("voice-effects", _voiceEffects);
-	ConfMan.set("text-speed", _textSpeed);
-	ConfMan.set("speech-mode", _speechMode);
+	ConfMan.set("voice_effects", _voiceEffects);
+	ConfMan.set("text_speed", _textSpeed);
+	ConfMan.set("speech_mode", _speechMode);
 	ConfMan.set("movement", _movement);
 	ConfMan.set("joystick", _joystick);
-	ConfMan.set("spew-on-error", _spewOnError);
-	ConfMan.set("show-fps", _showFps);
-	ConfMan.set("soft-renderer", _softRenderer);
-	ConfMan.set("gl-zbuffer", _glZbuffer);
+	ConfMan.set("spew_on_error", _spewOnError);
+	ConfMan.set("show_fps", _showFps);
+	ConfMan.set("soft_renderer", _softRenderer);
+	ConfMan.set("gl_zbuffer", _glZbuffer);
 	ConfMan.set("fullscreen", _fullscreen);
 
 	ConfMan.flushToDisk();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.