aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorsluicebox2019-07-14 18:46:34 -0700
committerFilippos Karapetis2019-07-21 18:20:07 +0300
commit954f5142cb9b1f8b6ea4e608a71b07fdfcc4e8ca (patch)
tree9788aa1977f6a5dd3f00065104c36c1c29e01292 /engines/sci/graphics
parent39551526b18f0f8b4ed0e460ead96f0b8b9d62c8 (diff)
downloadscummvm-rg350-954f5142cb9b1f8b6ea4e608a71b07fdfcc4e8ca.tar.gz
scummvm-rg350-954f5142cb9b1f8b6ea4e608a71b07fdfcc4e8ca.tar.bz2
scummvm-rg350-954f5142cb9b1f8b6ea4e608a71b07fdfcc4e8ca.zip
SCI: Implement full kWait behavior
Fixes PQ3 bug #11020
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/frameout.cpp4
-rw-r--r--engines/sci/graphics/portrait.cpp6
-rw-r--r--engines/sci/graphics/screen.cpp4
-rw-r--r--engines/sci/graphics/transitions.cpp4
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 505e2063f3..99fd8e62cb 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1182,14 +1182,14 @@ void GfxFrameout::shakeScreen(int16 numShakes, const ShakeDirection direction) {
}
updateScreen();
- g_sci->getEngineState()->wait(3);
+ g_sci->getEngineState()->sleep(3);
if (direction & kShakeVertical) {
g_system->setShakePos(0);
}
updateScreen();
- g_sci->getEngineState()->wait(3);
+ g_sci->getEngineState()->sleep(3);
}
}
diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 8c41dabb11..b191cb1ab1 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -301,7 +301,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
// Wait till syncTime passed, then show specific animation bitmap
if (timerPosition > 0) {
do {
- g_sci->getEngineState()->wait(1);
+ g_sci->getEngineState()->sleep(1);
curEvent = _event->getSciEvent(kSciEventAny);
if (curEvent.type == kSciEventMousePress ||
(curEvent.type == kSciEventKeyDown && curEvent.character == kSciKeyEsc) ||
@@ -324,7 +324,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
timerPositionWithin += raveLipSyncTicks;
do {
- g_sci->getEngineState()->wait(1);
+ g_sci->getEngineState()->sleep(1);
curEvent = _event->getSciEvent(kSciEventAny);
if (curEvent.type == kSciEventMousePress ||
(curEvent.type == kSciEventKeyDown && curEvent.character == kSciKeyEsc) ||
@@ -383,7 +383,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
// Wait till syncTime passed, then show specific animation bitmap
do {
- g_sci->getEngineState()->wait(1);
+ g_sci->getEngineState()->sleep(1);
curEvent = _event->getSciEvent(kSciEventAny);
if (curEvent.type == kSciEventMousePress ||
(curEvent.type == kSciEventKeyboard && curEvent.data == kSciKeyEsc) ||
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index b9cef360dc..c6f6c4043d 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -608,13 +608,13 @@ void GfxScreen::kernelShakeScreen(uint16 shakeCount, uint16 directions) {
setVerticalShakePos(10);
// TODO: horizontal shakes
g_system->updateScreen();
- g_sci->getEngineState()->wait(3);
+ g_sci->getEngineState()->sleep(3);
if (directions & kShakeVertical)
setVerticalShakePos(0);
g_system->updateScreen();
- g_sci->getEngineState()->wait(3);
+ g_sci->getEngineState()->sleep(3);
}
}
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index c75580a077..78f465ca3a 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -323,7 +323,7 @@ void GfxTransitions::fadeOut() {
}
}
g_system->getPaletteManager()->setPalette(workPalette + 3, 1, tillColorNr);
- g_sci->getEngineState()->wait(2);
+ g_sci->getEngineState()->sleep(2);
}
}
@@ -337,7 +337,7 @@ void GfxTransitions::fadeIn() {
for (stepNr = 0; stepNr <= 100; stepNr += 10) {
_palette->kernelSetIntensity(1, tillColorNr + 1, stepNr, true);
- g_sci->getEngineState()->wait(2);
+ g_sci->getEngineState()->sleep(2);
}
}