aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2006-04-29 02:01:32 +0000
committerTravis Howell2006-04-29 02:01:32 +0000
commit8e7895e7bcbb1e9d233174751cc0ff8e65c565b6 (patch)
treeb9795375dec1884265f54124d9e86fbdf8b34b37 /engines
parent9774261e0f11f14b3403a6894fa58e9a180ac51b (diff)
downloadscummvm-rg350-8e7895e7bcbb1e9d233174751cc0ff8e65c565b6.tar.gz
scummvm-rg350-8e7895e7bcbb1e9d233174751cc0ff8e65c565b6.tar.bz2
scummvm-rg350-8e7895e7bcbb1e9d233174751cc0ff8e65c565b6.zip
Add more timer code differences in FF
svn-id: r22201
Diffstat (limited to 'engines')
-rw-r--r--engines/simon/simon.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 73a7ed0049..7514f1cb3c 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -2795,9 +2795,17 @@ void SimonEngine::timer_proc1() {
if (!(_lockWord & 0x10)) {
if (getGameType() == GType_FF) {
_syncFlag2 ^= 1;
-
- if (!_syncFlag2)
+ if (!_syncFlag2) {
processVgaEvents();
+ } else {
+ // Double speed on Oracle
+ if (getBitFlag(99)) {
+ processVgaEvents();
+ } else if (_scrollCount == 0) {
+ _lockWord &= ~2;
+ return;
+ }
+ }
} else {
processVgaEvents();
processVgaEvents();