From 4c9b3ce5e3e6997f20e662ce61ded442edfa84e4 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 1 Jun 2006 09:49:56 +0000
Subject: 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
---
 engines/kyra/gui.cpp      | 2 ++
 engines/kyra/saveload.cpp | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'engines')

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;
 }
 
-- 
cgit v1.2.3