[Scummvm-cvs-logs] SF.net SVN: scummvm: [31250] scummvm/trunk/engines/kyra/script_v2.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Mar 26 22:24:22 CET 2008
Revision: 31250
http://scummvm.svn.sourceforge.net/scummvm/?rev=31250&view=rev
Author: lordhoto
Date: 2008-03-26 14:24:22 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
Possible fix for part 1 of bug #1926547 "HoF: Right mouse button messes up gameplay".
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script_v2.cpp
Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp 2008-03-26 21:17:07 UTC (rev 31249)
+++ scummvm/trunk/engines/kyra/script_v2.cpp 2008-03-26 21:24:22 UTC (rev 31250)
@@ -278,9 +278,9 @@
_screen->hideMouse();
int curTime = 0;
- while (curTime < maxTimes && !skipFlag()) {
+ while (curTime < maxTimes) {
if (startFrame < endFrame) {
- for (int i = startFrame; i <= endFrame && !skipFlag(); ++i) {
+ for (int i = startFrame; i <= endFrame; ++i) {
uint32 endTime = _system->getMillis() + waitTime * _tickLength;
_wsaSlots[slot]->displayFrame(i, 0xC000 | copyFlags, 0, 0);
_screen->updateScreen();
@@ -288,12 +288,12 @@
do {
update();
- if (endTime - _system->getMillis() >= 10)
+ if (endTime - _system->getMillis() >= 10 && !skipFlag())
delay(10);
- } while (_system->getMillis() < endTime);
+ } while (_system->getMillis() < endTime && !skipFlag());
}
} else {
- for (int i = startFrame; i >= endFrame && !skipFlag(); --i) {
+ for (int i = startFrame; i >= endFrame; --i) {
uint32 endTime = _system->getMillis() + waitTime * _tickLength;
_wsaSlots[slot]->displayFrame(i, 0xC000 | copyFlags, 0, 0);
_screen->updateScreen();
@@ -301,9 +301,9 @@
do {
update();
- if (endTime - _system->getMillis() >= 10)
+ if (endTime - _system->getMillis() >= 10 && !skipFlag())
delay(10);
- } while (_system->getMillis() < endTime);
+ } while (_system->getMillis() < endTime && !skipFlag());
}
}
@@ -336,7 +336,7 @@
_screen->hideMouse();
- while (currentFrame <= lastFrame && !skipFlag()) {
+ while (currentFrame <= lastFrame) {
uint32 endTime = _system->getMillis() + frameDelay;
_wsaSlots[index]->displayFrame(currentFrame++, copyParam, 0, 0);
_screen->updateScreen();
@@ -366,7 +366,7 @@
int currentFrame = 0;
const int lastFrame = _wsaSlots[index]->frames();
- while (currentFrame <= lastFrame && !skipFlag()) {
+ while (currentFrame <= lastFrame) {
uint32 endTime = _system->getMillis() + frameDelay;
_wsaSlots[index]->displayFrame(currentFrame++, copyParam, 0, 0);
if (doUpdate)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list