[Scummvm-cvs-logs] CVS: scummvm/kyra screen.cpp,1.36,1.37 script_v1.cpp,1.63,1.64 staticres.cpp,1.36,1.37

Johannes Schickel lordhoto at users.sourceforge.net
Wed Jan 11 05:29:03 CET 2006


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

Modified Files:
	screen.cpp script_v1.cpp staticres.cpp 
Log Message:
Fixed for bug report # 1401360.
Also added some delay calls while waiting in some script functions.


Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/screen.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- screen.cpp	10 Jan 2006 02:43:30 -0000	1.36
+++ screen.cpp	11 Jan 2006 13:28:36 -0000	1.37
@@ -155,7 +155,7 @@
 	uint8 tempPal[768];
 	memcpy(tempPal, _currentPalette, 768);
 	memcpy(&tempPal[startIndex*3], _vm->palTable1()[palIndex], size*3);
-	fadePalette(tempPal, fadeTime*9);
+	fadePalette(tempPal, fadeTime*18);
 	memcpy(&_currentPalette[startIndex*3], &tempPal[startIndex*3], size*3);
 	setScreenPalette(_currentPalette);
 	_system->updateScreen();
@@ -172,11 +172,11 @@
 			maxDiff = diff;
 		}
 	}
-	delay <<= 8;
+	int16 delayInc = delay << 8;
 	if (maxDiff != 0) {
-		delay /= maxDiff;
+		delayInc /= maxDiff;
 	}
-	int delayInc = delay;
+	delay = delayInc;
 	for (diff = 1; diff <= maxDiff; ++diff) {
 		if (delayInc >= 512) {
 			break;

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- script_v1.cpp	10 Jan 2006 17:18:16 -0000	1.63
+++ script_v1.cpp	11 Jan 2006 13:28:37 -0000	1.64
@@ -250,6 +250,7 @@
 	while (_sprites->_anims[stackPos(0)].play) {
 		_sprites->updateSceneAnims();
 		_animator->updateAllObjectShapes();
+		delay(10);
 	}
 	_animator->restoreAllObjectBackgrounds();
 	_screen->showMouse();
@@ -463,7 +464,8 @@
 			} else {
 				_screen->updateScreen();
 			}
-			delay(10);
+			if (continueTime - _system->getMillis() >= 10)
+				delay(10);
 		}
 	}
 	
@@ -489,7 +491,8 @@
 	while (_system->getMillis() < continueTime) {
 		_sprites->updateSceneAnims();
 		_animator->updateAllObjectShapes();
-		delay(10);
+		if (continueTime - _system->getMillis() >= 10)
+			delay(10);
 	}
 	_screen->showMouse();
 	return 0;
@@ -529,7 +532,8 @@
 		while (_system->getMillis() < nextRun) {
 			_sprites->updateSceneAnims();
 			_animator->updateAllObjectShapes();
-			delay(10);
+			if (nextRun - _system->getMillis() >= 10)
+				delay(10);
 		}
 	}
 	_screen->showMouse();
@@ -716,7 +720,8 @@
 	while (_system->getMillis() < continueTime) {
 		_sprites->updateSceneAnims();
 		_animator->updateAllObjectShapes();
-		delay(10);
+		if (continueTime - _system->getMillis() >= 10)
+			delay(10);
 	}
 	_screen->showMouse();
 	
@@ -1254,6 +1259,8 @@
 			while (_system->getMillis() < nextTime) {
 				_sprites->updateSceneAnims();
 				_animator->updateAllObjectShapes();
+				if (nextTime - _system->getMillis() >= 10)
+					delay(10);
 			}
 		}
 		_screen->showMouse();

Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/staticres.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- staticres.cpp	8 Jan 2006 23:29:36 -0000	1.36
+++ staticres.cpp	11 Jan 2006 13:28:38 -0000	1.37
@@ -667,6 +667,7 @@
 	Opcode(cmd_fillRect),
 	Opcode(cmd_dummy),
 	Opcode(cmd_dummy),
+	Opcode(cmd_dummy),
 	Opcode(cmd_dummy)
 };
 #undef Opcode





More information about the Scummvm-git-logs mailing list