[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.80,1.81 kyra.h,1.41,1.42 script_v1.cpp,1.34,1.35

[Johannes Schickel]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14988

Modified Files:
	kyra.cpp kyra.h script_v1.cpp 
Log Message:
Changed use of setTimerCountdown to new implemented setTimerDelay.


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- kyra.cpp	9 Dec 2005 23:02:16 -0000	1.80
+++ kyra.cpp	9 Dec 2005 23:48:51 -0000	1.81
@@ -4436,6 +4436,11 @@
 	_timerNextRun = 0;
 }
 
+void KyraEngine::setTimerDelay(uint8 timer, int32 countdown) {
+	debug(9, "setTimerDelay(%i, %d)", timer, countdown);
+	_timers[timer].countdown = countdown;
+}
+
 int16 KyraEngine::getTimerDelay(uint8 timer) {
 	debug(9, "getTimerDelay(%i)", timer);
 	return _timers[timer].countdown;

Index: kyra.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kyra.h	9 Dec 2005 23:02:16 -0000	1.41
+++ kyra.h	9 Dec 2005 23:48:52 -0000	1.42
@@ -210,6 +210,7 @@
 	void updateGameTimers();
 	void clearNextEventTickCount();
 	void setTimerCountdown(uint8 timer, int32 countdown);
+	void setTimerDelay(uint8 timer, int32 countdown);
 	int16 getTimerDelay(uint8 timer);
 	void enableTimer(uint8 timer);
 	void disableTimer(uint8 timer);

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- script_v1.cpp	9 Dec 2005 23:02:16 -0000	1.34
+++ script_v1.cpp	9 Dec 2005 23:48:52 -0000	1.35
@@ -1190,7 +1190,7 @@
 
 int KyraEngine::cmd_setCharactersMovementDelay(ScriptState *script) {
 	debug(3, "cmd_setCharactersMovementDelay(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
-	setTimerCountdown(stackPos(0)+5, stackPos(1));
+	setTimerDelay(stackPos(0)+5, stackPos(1));
 	return 0;
 }