[Scummvm-cvs-logs] CVS: scummvm/kyra script_v1.cpp,1.59,1.60
Johannes Schickel
lordhoto at users.sourceforge.net
Wed Jan 4 08:58:02 CET 2006
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25515
Modified Files:
script_v1.cpp
Log Message:
Added a little 'hack' for cmd_pauseTicks until it is fully implemented
and fixed some wsa playing functions.
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- script_v1.cpp 4 Jan 2006 07:39:16 -0000 1.59
+++ script_v1.cpp 4 Jan 2006 16:57:16 -0000 1.60
@@ -67,6 +67,8 @@
debug(3, "cmd_pauseTicks(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
if (stackPos(1)) {
warning("STUB: special cmd_pauseTicks");
+ // delete this after correct implementing
+ delayWithTicks(stackPos(0));
} else {
delayWithTicks(stackPos(0));
}
@@ -482,13 +484,13 @@
_movieObjects[wsaIndex]->_y = ypos;
_movieObjects[wsaIndex]->_drawPage = 0;
_movieObjects[wsaIndex]->displayFrame(frame);
+ _animator->_updateScreen = true;
uint32 continueTime = waitTime * _tickLength + _system->getMillis();
while (_system->getMillis() < continueTime) {
_sprites->updateSceneAnims();
_animator->updateAllObjectShapes();
delay(10);
}
- _animator->_updateScreen = true;
_screen->showMouse();
return 0;
}
@@ -523,6 +525,7 @@
for (; startFrame <= endFrame; ++startFrame) {
uint32 nextRun = _system->getMillis() + delayTime * _tickLength;
_movieObjects[wsaIndex]->displayFrame(startFrame);
+ _animator->_updateScreen = true;
while (_system->getMillis() < nextRun) {
_sprites->updateSceneAnims();
_animator->updateAllObjectShapes();
@@ -708,6 +711,7 @@
_movieObjects[wsaIndex]->_y = ypos;
_movieObjects[wsaIndex]->_drawPage = 2;
_movieObjects[wsaIndex]->displayFrame(frame);
+ _animator->_updateScreen = true;
uint32 continueTime = waitTime * _tickLength + _system->getMillis();
while (_system->getMillis() < continueTime) {
_sprites->updateSceneAnims();
More information about the Scummvm-git-logs
mailing list