[Scummvm-cvs-logs] SF.net SVN: scummvm: [22814] scummvm/trunk/engines/kyra

[eriktorbjorn at users.sourceforge.net]

Revision: 22814
Author:   eriktorbjorn
Date:     2006-06-01 02:49:56 -0700 (Thu, 01 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22814&view=rev

Log Message:
-----------
Call setWalkspeed() after reading config settings, and after loading savegames,
so that _timers[] is properly synced with _configWalkspeed. Should fix bug
#1498660.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui.cpp
    scummvm/trunk/engines/kyra/saveload.cpp
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp	2006-05-31 22:49:24 UTC (rev 22813)
+++ scummvm/trunk/engines/kyra/gui.cpp	2006-06-01 09:49:56 UTC (rev 22814)
@@ -65,6 +65,8 @@
 		_configVoice = 1;	// Voice only
 	else
 		_configVoice = 0;	// Text only
+
+	setWalkspeed(_configWalkspeed);
 }
 
 void KyraEngine::writeSettings() {

Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp	2006-05-31 22:49:24 UTC (rev 22813)
+++ scummvm/trunk/engines/kyra/saveload.cpp	2006-06-01 09:49:56 UTC (rev 22814)
@@ -234,6 +234,10 @@
 	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;
 }
 


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