[Scummvm-git-logs] scummvm master -> 90471b02467836a0395878007860c2d6d78b12cc
OMGPizzaGuy
48367439+OMGPizzaGuy at users.noreply.github.com
Sat Jan 30 15:05:35 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d5ae79fe99 ULTIMA8: Move a few options from pentagram.ini to ConfigManager
90471b0246 ULTIMA8: Fix access of textdelay option
Commit: d5ae79fe99b8714bf25a2574581cc59aa75da5c4
https://github.com/scummvm/scummvm/commit/d5ae79fe99b8714bf25a2574581cc59aa75da5c4
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-30T09:05:02-06:00
Commit Message:
ULTIMA8: Move a few options from pentagram.ini to ConfigManager
These options will remain hidden from GUI options at this point.
Changed paths:
engines/ultima/ultima8/games/game.cpp
engines/ultima/ultima8/games/remorse_game.cpp
engines/ultima/ultima8/games/u8_game.cpp
engines/ultima/ultima8/gumps/bark_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/menu_gump.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.cpp
engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
diff --git a/engines/ultima/ultima8/games/game.cpp b/engines/ultima/ultima8/games/game.cpp
index a0dc27a5a1..a854a49ac3 100644
--- a/engines/ultima/ultima8/games/game.cpp
+++ b/engines/ultima/ultima8/games/game.cpp
@@ -20,10 +20,11 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/games/u8_game.h"
#include "ultima/ultima8/games/remorse_game.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/gumps/main_menu_process.h"
@@ -59,9 +60,7 @@ Game *Game::createGame(const GameInfo *info) {
}
uint32 Game::I_playEndgame(const uint8 *args, unsigned int /*argsize*/) {
- SettingManager *settingman = SettingManager::get_instance();
- settingman->set("endgame", true);
- settingman->write();
+ ConfMan.setBool("endgame", true);
PaletteManager *palman = PaletteManager::get_instance();
palman->untransformPalette(PaletteManager::Pal_Game);
diff --git a/engines/ultima/ultima8/games/remorse_game.cpp b/engines/ultima/ultima8/games/remorse_game.cpp
index dce5b3d2f9..8b8f54f760 100644
--- a/engines/ultima/ultima8/games/remorse_game.cpp
+++ b/engines/ultima/ultima8/games/remorse_game.cpp
@@ -20,10 +20,11 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/games/remorse_game.h"
#include "ultima/ultima8/games/start_crusader_process.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/filesys/file_system.h"
#include "ultima/ultima8/graphics/palette_manager.h"
#include "ultima/ultima8/gumps/movie_gump.h"
@@ -42,11 +43,9 @@ namespace Ultima8 {
RemorseGame::RemorseGame() : Game() {
// Set some defaults for gameplay-related settings
- SettingManager *settingman = SettingManager::get_instance();
- settingman->setDefault("skipstart", false);
- settingman->setDefault("endgame", false);
- settingman->setDefault("footsteps", true);
- settingman->setDefault("textdelay", 5);
+ ConfMan.registerDefault("endgame", true);
+ ConfMan.registerDefault("footsteps", true);
+ ConfMan.registerDefault("textdelay", 5);
}
RemorseGame::~RemorseGame() {
diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index d9e3a9537a..0a6f1856ac 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/games/u8_game.h"
@@ -35,7 +37,6 @@
#include "ultima/ultima8/world/item_factory.h"
#include "ultima/ultima8/kernel/object_manager.h"
#include "ultima/ultima8/ultima8.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/gumps/movie_gump.h"
#include "ultima/ultima8/gumps/credits_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
@@ -49,18 +50,16 @@ namespace Ultima8 {
U8Game::U8Game() : Game() {
// Set some defaults for gameplay-related settings
- SettingManager *settingman = SettingManager::get_instance();
- settingman->setDefault("skipstart", false);
- settingman->setDefault("endgame", false);
- settingman->setDefault("quotes", false);
- settingman->setDefault("footsteps", true);
- settingman->setDefault("targetedjump", true);
+ ConfMan.registerDefault("endgame", false);
+ ConfMan.registerDefault("quotes", false);
+ ConfMan.registerDefault("footsteps", true);
+ ConfMan.registerDefault("targetedjump", true);
const GameInfo *info = Ultima8Engine::get_instance()->getGameInfo();
if (info->_language == GameInfo::GAMELANG_JAPANESE) {
- settingman->setDefault("textdelay", 20);
+ ConfMan.registerDefault("textdelay", 20);
} else {
- settingman->setDefault("textdelay", 8);
+ ConfMan.registerDefault("textdelay", 8);
}
}
diff --git a/engines/ultima/ultima8/gumps/bark_gump.cpp b/engines/ultima/ultima8/gumps/bark_gump.cpp
index e1a3b89df8..74de02d4c2 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.cpp
+++ b/engines/ultima/ultima8/gumps/bark_gump.cpp
@@ -20,12 +20,13 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/gumps/bark_gump.h"
#include "ultima/ultima8/gumps/widgets/text_widget.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/audio/audio_process.h"
#include "ultima/ultima8/world/get_object.h"
-#include "ultima/ultima8/conf/setting_manager.h"
namespace Ultima {
namespace Ultima8 {
@@ -43,7 +44,7 @@ BarkGump::BarkGump(uint16 owner, const Std::string &msg, uint32 speechShapeNum)
ItemRelativeGump(0, 0, 100, 100, owner, FLAG_KEEP_VISIBLE, LAYER_ABOVE_NORMAL),
_barked(msg), _counter(100), _speechShapeNum(speechShapeNum),
_speechLength(0), _totalTextHeight(0), _textWidget(0), _textDelay(20) {
- SettingManager::get_instance()->get("textdelay", _textDelay);
+ _textDelay = ConfMan.getBool("textdelay");
}
BarkGump::~BarkGump(void) {
@@ -212,7 +213,7 @@ bool BarkGump::loadData(Common::ReadStream *rs, uint32 version) {
if (!widget)
return false;
- SettingManager::get_instance()->get("textdelay", _textDelay);
+ _textDelay = ConfMan.getBool("textdelay");
// This is just a hack
Rect d;
diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 9ffef45fff..2f12850f6e 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/gumps/credits_gump.h"
#include "ultima/ultima8/ultima8.h"
@@ -28,7 +30,6 @@
#include "ultima/ultima8/graphics/fonts/font.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
#include "ultima/ultima8/audio/music_process.h"
-#include "ultima/ultima8/conf/setting_manager.h"
namespace Ultima {
namespace Ultima8 {
@@ -160,9 +161,7 @@ void CreditsGump::run() {
_state = CS_CLOSING;
if (!_configKey.empty()) {
- SettingManager *settingman = SettingManager::get_instance();
- settingman->set(_configKey, true);
- settingman->write();
+ ConfMan.setBool(_configKey, true);
}
return;
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index 1338a88d70..cad9270230 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/gumps/menu_gump.h"
#include "ultima/ultima8/gumps/remorse_menu_gump.h"
#include "ultima/ultima8/games/game_data.h"
@@ -33,7 +35,6 @@
#include "ultima/ultima8/games/game.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/graphics/palette_manager.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/gumps/widgets/edit_widget.h"
#include "ultima/ultima8/gumps/u8_save_gump.h"
@@ -124,11 +125,8 @@ void MenuGump::InitGump(Gump *newparent, bool take_focus) {
logo->InitGump(this, false);
if (!_nameEntryMode) {
- SettingManager *settingman = SettingManager::get_instance();
- bool endgame = false;
- bool quotes = false;
- settingman->get("endgame", endgame);
- settingman->get("quotes", quotes);
+ bool endgame = ConfMan.getBool("endgame");
+ bool quotes = ConfMan.getBool("quotes");
int x = _dims.width() / 2 + 14;
int y = 18;
@@ -222,10 +220,8 @@ void MenuGump::ChildNotify(Gump *child, uint32 message) {
}
void MenuGump::selectEntry(int entry) {
- SettingManager *settingman = SettingManager::get_instance();
- bool endgame, quotes;
- settingman->get("endgame", endgame);
- settingman->get("quotes", quotes);
+ bool endgame = ConfMan.getBool("endgame");
+ bool quotes = ConfMan.getBool("quotes");
switch (entry) {
case 1: // Intro
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index e6b731ff3f..95ae160956 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -20,6 +20,7 @@
*
*/
+#include "common/config-manager.h"
#include "ultima/ultima8/world/actors/actor_anim_process.h"
#include "ultima/ultima8/world/actors/anim_action.h"
@@ -32,7 +33,6 @@
#include "ultima/ultima8/world/current_map.h"
#include "ultima/ultima8/world/actors/animation_tracker.h"
#include "ultima/ultima8/audio/audio_process.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/world/actors/combat_process.h"
#include "ultima/ultima8/world/sprite_process.h"
#include "ultima/ultima8/graphics/palette_fader_process.h"
@@ -432,9 +432,7 @@ void ActorAnimProcess::doSpecial() {
}
// play PC/NPC footsteps
- SettingManager *settingman = SettingManager::get_instance();
- bool playavfootsteps;
- settingman->get("footsteps", playavfootsteps);
+ bool playavfootsteps = ConfMan.getBool("footsteps");
if (_itemNum != 1 || playavfootsteps) {
UCList itemlist(2);
LOOPSCRIPT(script, LS_TOKEN_TRUE);
diff --git a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
index d589116c77..543c6c3fe9 100644
--- a/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/u8_avatar_mover_process.cpp
@@ -20,13 +20,14 @@
*
*/
+#include "common/config-manager.h"
+
#include "ultima/ultima8/world/actors/u8_avatar_mover_process.h"
#include "ultima/ultima8/world/actors/main_actor.h"
#include "ultima/ultima8/gumps/game_map_gump.h"
#include "ultima/ultima8/kernel/kernel.h"
#include "ultima/ultima8/world/actors/targeted_anim_process.h"
#include "ultima/ultima8/world/actors/avatar_gravity_process.h"
-#include "ultima/ultima8/conf/setting_manager.h"
#include "ultima/ultima8/audio/music_process.h"
#include "ultima/ultima8/world/get_object.h"
#include "ultima/ultima8/misc/direction_util.h"
@@ -706,9 +707,7 @@ void U8AvatarMoverProcess::jump(Animation::Sequence action, Direction direction)
return;
}
- bool targeting;
- SettingManager::get_instance()->get("targetedjump", targeting);
-
+ bool targeting = ConfMan.getBool("targetedjump");
if (targeting) {
Mouse *mouse = Mouse::get_instance();
int32 coords[3];
Commit: 90471b02467836a0395878007860c2d6d78b12cc
https://github.com/scummvm/scummvm/commit/90471b02467836a0395878007860c2d6d78b12cc
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-30T09:05:02-06:00
Commit Message:
ULTIMA8: Fix access of textdelay option
Changed paths:
engines/ultima/ultima8/gumps/bark_gump.cpp
diff --git a/engines/ultima/ultima8/gumps/bark_gump.cpp b/engines/ultima/ultima8/gumps/bark_gump.cpp
index 74de02d4c2..ef63f96d81 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.cpp
+++ b/engines/ultima/ultima8/gumps/bark_gump.cpp
@@ -44,7 +44,7 @@ BarkGump::BarkGump(uint16 owner, const Std::string &msg, uint32 speechShapeNum)
ItemRelativeGump(0, 0, 100, 100, owner, FLAG_KEEP_VISIBLE, LAYER_ABOVE_NORMAL),
_barked(msg), _counter(100), _speechShapeNum(speechShapeNum),
_speechLength(0), _totalTextHeight(0), _textWidget(0), _textDelay(20) {
- _textDelay = ConfMan.getBool("textdelay");
+ _textDelay = ConfMan.getInt("textdelay");
}
BarkGump::~BarkGump(void) {
@@ -213,7 +213,7 @@ bool BarkGump::loadData(Common::ReadStream *rs, uint32 version) {
if (!widget)
return false;
- _textDelay = ConfMan.getBool("textdelay");
+ _textDelay = ConfMan.getInt("textdelay");
// This is just a hack
Rect d;
More information about the Scummvm-git-logs
mailing list