[Scummvm-cvs-logs] scummvm master -> cc3fc3f3da71a39797cb2d25ff531f174c126358

athrxx athrxx at scummvm.org
Mon Jan 9 00:01:32 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cc3fc3f3da KYRA: fix regression in non-playable HOF demo


Commit: cc3fc3f3da71a39797cb2d25ff531f174c126358
    https://github.com/scummvm/scummvm/commit/cc3fc3f3da71a39797cb2d25ff531f174c126358
Author: athrxx (athrxx at scummvm.org)
Date: 2012-01-08T14:59:10-08:00

Commit Message:
KYRA: fix regression in non-playable HOF demo

(missing animated items)

Changed paths:
    engines/kyra/sequences_hof.cpp



diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 2e5e20c..686c3c9 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -234,6 +234,8 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 				int32 dly = _tickLength - (now - _seqSubFrameStartTime);
 				if (dly > 0)
 					delay(MIN<uint32>(dly, tdiff));
+				else
+					updateInput();
 			}
 		}
 
@@ -263,6 +265,8 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 			int32 dly = _tickLength - (now - _seqSubFrameStartTime);
 			if (dly > 0)
 				delay(MIN<uint32>(dly, tdiff));
+			else
+				updateInput();
 		}
 
 		seq_sequenceCommand(cseq.finalCommand);
@@ -2780,8 +2784,8 @@ void KyraEngine_HoF::seq_init() {
 		Screen::decodeFrame4(shp + 10, _animShapeFiledata, outsize);
 		delete[] shp;
 
-		for (int numShp = 0; getShapePtr(numShp); ++numShp)
-			addShapeToPool(_screen->getPtrToShape(_animShapeFiledata, numShp), numShp);
+		for (int i = 0; i < 20; i++)
+			addShapeToPool(_screen->getPtrToShape(_animShapeFiledata, i), i);
 	} else {
 		const MainMenu::StaticData data = {
 			{ _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98], 0 },






More information about the Scummvm-git-logs mailing list