aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-06-01 09:49:56 +0000
committerTorbjörn Andersson2006-06-01 09:49:56 +0000
commit4c9b3ce5e3e6997f20e662ce61ded442edfa84e4 (patch)
tree2ea5cbb3ab3db0b69735e8c35103356e11966b64 /engines
parent9dabbb0c14d89b3b7954a2e6a83c1dab5b411e93 (diff)
downloadscummvm-rg350-4c9b3ce5e3e6997f20e662ce61ded442edfa84e4.tar.gz
scummvm-rg350-4c9b3ce5e3e6997f20e662ce61ded442edfa84e4.tar.bz2
scummvm-rg350-4c9b3ce5e3e6997f20e662ce61ded442edfa84e4.zip
Call setWalkspeed() after reading config settings, and after loading savegames,
so that _timers[] is properly synced with _configWalkspeed. Should fix bug #1498660. svn-id: r22814
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/gui.cpp2
-rw-r--r--engines/kyra/saveload.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 2fce4e335f..5027792581 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -65,6 +65,8 @@ void KyraEngine::readSettings() {
_configVoice = 1; // Voice only
else
_configVoice = 0; // Text only
+
+ setWalkspeed(_configWalkspeed);
}
void KyraEngine::writeSettings() {
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index b718b8826b..827a97a801 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -234,6 +234,10 @@ void KyraEngine::loadGame(const char *fileName) {
else
debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", saveName);
+ // We didn't explicitly set the walk speed, but it's saved as part of
+ // the _timers array, so we need to re-sync it with _configWalkspeed.
+ setWalkspeed(_configWalkspeed);
+
delete in;
}