[Scummvm-git-logs] scummvm master -> 6b74b4ac631f0879ba07b08ebb887b2c8c7b5f6c
OMGPizzaGuy
48367439+OMGPizzaGuy at users.noreply.github.com
Sun Jan 31 16:08:50 UTC 2021
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2b962e9083 ULTIMA8: Remove console command for setting config values.
ac938f6ebe ULTIMA8: move more options from pentagram.ini to ConfigManager
6b74b4ac63 ULTIMA8: Use ConfigManager for lastSave option
Commit: 2b962e908300fdb6ed89aaef7ba99a5a72ecd2f9
https://github.com/scummvm/scummvm/commit/2b962e908300fdb6ed89aaef7ba99a5a72ecd2f9
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-31T10:06:33-06:00
Commit Message:
ULTIMA8: Remove console command for setting config values.
Changed paths:
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/misc/debugger.h
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index d9ba1e7999..b7454c939e 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -83,7 +83,6 @@ Debugger::Debugger() : Shared::Debugger() {
registerCmd("Ultima8Engine::engineStats", WRAP_METHOD(Debugger, cmdEngineStats));
registerCmd("Ultima8Engine::changeGame", WRAP_METHOD(Debugger, cmdChangeGame));
registerCmd("Ultima8Engine::listGames", WRAP_METHOD(Debugger, cmdListGames));
- registerCmd("Ultima8Engine::memberVar", WRAP_METHOD(Debugger, cmdMemberVar));
registerCmd("Ultima8Engine::setVideoMode", WRAP_METHOD(Debugger, cmdSetVideoMode));
registerCmd("Ultima8Engine::toggleAvatarInStasis", WRAP_METHOD(Debugger, cmdToggleAvatarInStasis));
registerCmd("Ultima8Engine::togglePaintEditorItems", WRAP_METHOD(Debugger, cmdTogglePaintEditorItems));
@@ -352,77 +351,6 @@ bool Debugger::cmdCloseItemGumps(int argc, const char **argv) {
return false;
}
-bool Debugger::cmdMemberVar(int argc, const char **argv) {
- if (argc == 1) {
- debugPrintf("Usage: Ultima8Engine::memberVar <member> [newvalue] [updateini]\n");
- return true;
- }
-
- Ultima8Engine *g = Ultima8Engine::get_instance();
-
- // Set the pointer to the correct type
- bool *b = nullptr;
- int *i = nullptr;
- Std::string *str = nullptr;
- istring *istr = nullptr;
-
- // ini entry name if supported
- const char *ini = nullptr;
-
- if (!scumm_stricmp(argv[1], "_frameLimit")) {
- b = &g->_frameLimit;
- ini = "frameLimit";
- } else if (!scumm_stricmp(argv[1], "_frameSkip")) {
- b = &g->_frameSkip;
- ini = "frameSkip";
- } else if (!scumm_stricmp(argv[1], "_interpolate")) {
- b = &g->_interpolate;
- ini = "interpolate";
- } else {
- debugPrintf("Unknown member: %s\n", argv[1]);
- return true;
- }
-
- // Set the value
- if (argc >= 3) {
- if (b)
- *b = !scumm_stricmp(argv[2], "yes") || !scumm_stricmp(argv[2], "true");
- else if (istr)
- *istr = argv[2];
- else if (i)
- *i = strtol(argv[2], 0, 0);
- else if (str)
- *str = argv[2];
-
- // Set config value
- if (argc >= 4 && ini && *ini && (!scumm_stricmp(argv[3], "yes") || !scumm_stricmp(argv[3], "true"))) {
- if (b)
- g->_settingMan->set(ini, *b);
- else if (istr)
- g->_settingMan->set(ini, *istr);
- else if (i)
- g->_settingMan->set(ini, *i);
- else if (str)
- g->_settingMan->set(ini, *str);
- }
- }
-
- // Print the value
- debugPrintf("Ultima8Engine::%s = ", argv[1]);
- if (b)
- debugPrintf("%s", strBool(*b));
- else if (istr)
- debugPrintf("%s", istr->c_str());
- else if (i)
- debugPrintf("%d", *i);
- else if (str)
- debugPrintf("%s", str->c_str());
- debugPrintf("\n");
-
- return true;
-}
-
-
bool Debugger::cmdListSFX(int argc, const char **argv) {
AudioProcess *ap = AudioProcess::get_instance();
if (!ap) {
diff --git a/engines/ultima/ultima8/misc/debugger.h b/engines/ultima/ultima8/misc/debugger.h
index e7c9215b73..90e84aaa9c 100644
--- a/engines/ultima/ultima8/misc/debugger.h
+++ b/engines/ultima/ultima8/misc/debugger.h
@@ -151,7 +151,6 @@ private:
bool cmdTogglePaintEditorItems(int argc, const char **argv);
bool cmdToggleShowTouchingItems(int argc, const char **argv);
bool cmdCloseItemGumps(int argc, const char **argv);
- bool cmdMemberVar(int argc, const char **argv);
// Avatar mover
bool cmdStartJump(int argc, const char **argv);
Commit: ac938f6ebe0a3db554e260f9c5ea7defbd097ea4
https://github.com/scummvm/scummvm/commit/ac938f6ebe0a3db554e260f9c5ea7defbd097ea4
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-31T10:06:33-06:00
Commit Message:
ULTIMA8: move more options from pentagram.ini to ConfigManager
Changed paths:
engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 77c269ad5f..bfad417bca 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -334,17 +334,17 @@ bool Ultima8Engine::startupGame() {
ConfMan.registerDefault("overridefonts", false);
_ttfOverrides = ConfMan.getBool("overridefonts");
- _settingMan->setDefault("frameSkip", false);
- _settingMan->get("frameSkip", _frameSkip);
+ ConfMan.registerDefault("frameSkip", false);
+ _frameSkip = ConfMan.getBool("frameSkip");
- _settingMan->setDefault("frameLimit", true);
- _settingMan->get("frameLimit", _frameLimit);
+ ConfMan.registerDefault("frameLimit", true);
+ _frameLimit = ConfMan.getBool("frameLimit");
- _settingMan->setDefault("interpolate", true);
- _settingMan->get("interpolate", _interpolate);
+ ConfMan.registerDefault("interpolate", true);
+ _interpolate = ConfMan.getBool("interpolate");
- _settingMan->setDefault("cheat", false);
- _settingMan->get("cheat", _cheatsEnabled);
+ ConfMan.registerDefault("cheat", false);
+ _cheatsEnabled = ConfMan.getBool("cheat");
bool loaded = _game->loadFiles();
if (!loaded)
Commit: 6b74b4ac631f0879ba07b08ebb887b2c8c7b5f6c
https://github.com/scummvm/scummvm/commit/6b74b4ac631f0879ba07b08ebb887b2c8c7b5f6c
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-31T10:06:33-06:00
Commit Message:
ULTIMA8: Use ConfigManager for lastSave option
This option works like "save_slot" but is persisted to the config file. Should it just be renamed to match?
Changed paths:
engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index bfad417bca..7d16975c7a 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -357,7 +357,7 @@ bool Ultima8Engine::startupGame() {
int saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
if (saveSlot == -1)
- _settingMan->get("lastSave", saveSlot);
+ saveSlot = ConfMan.getInt("lastSave");
newGame(saveSlot);
@@ -914,9 +914,9 @@ bool Ultima8Engine::saveGame(int slot, const Std::string &desc, bool ignore_moda
Common::Error Ultima8Engine::loadGameState(int slot) {
Common::Error result = Shared::UltimaEngine::loadGameState(slot);
if (result.getCode() == Common::kNoError)
- _settingMan->set("lastSave", slot);
+ ConfMan.setInt("lastSave", slot);
else
- _settingMan->set("lastSave", "");
+ ConfMan.set("lastSave", "");
return result;
}
@@ -926,9 +926,9 @@ Common::Error Ultima8Engine::saveGameState(int slot, const Common::String &desc,
if (!isAutosave) {
if (result.getCode() == Common::kNoError)
- _settingMan->set("lastSave", slot);
+ ConfMan.setInt("lastSave", slot);
else
- _settingMan->set("lastSave", "");
+ ConfMan.set("lastSave", "");
}
return result;
@@ -1136,7 +1136,7 @@ bool Ultima8Engine::newGame(int saveSlot) {
}
if (saveSlot == -1)
- _settingMan->set("lastSave", "");
+ ConfMan.set("lastSave", "");
return true;
}
More information about the Scummvm-git-logs
mailing list