libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 17:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Possible fix for part 1 of bug #1926547 "HoF: Right mouse button messes up gameplay".

Browse Source 
svn-id: r31250
This commit is contained in:
Johannes Schickel 2008-03-26 21:24:22 +00:00
parent 7c33605761
commit c9b9398561
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/kyra/script_v2.cpp
View File

@ -278,9 +278,9 @@ int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) {
_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 @@ int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) {
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 @@ int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) {
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 @@ int KyraEngine_v2::o2_displayWsaSequentialFrames(ScriptState *script) {
_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 KyraEngine_v2::o2_displayWsaSequence(ScriptState *script) {
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)