aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-06-20 14:47:14 +0000
committerTravis Howell2004-06-20 14:47:14 +0000
commit3fd30cda0cf4c87475963058a3a6329edc7fc521 (patch)
tree23aaa173425a2e69bc1f72761bc77157903c5a18 /scumm/script_v6.cpp
parentb6ce351f6d65309175f53182be4c3d97f3ce3e62 (diff)
downloadscummvm-rg350-3fd30cda0cf4c87475963058a3a6329edc7fc521.tar.gz
scummvm-rg350-3fd30cda0cf4c87475963058a3a6329edc7fc521.tar.bz2
scummvm-rg350-3fd30cda0cf4c87475963058a3a6329edc7fc521.zip
Didn't need to split it after all.
svn-id: r13973
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 5b6c5ba6df..cf834cb7d6 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -3040,8 +3040,15 @@ void ScummEngine_v6::o6_getDateTime() {
void ScummEngine_v6::o6_unknownE1() {
// this opcode check ground area in minigame "Asteroid Lander" in the dig
- int y = pop();
- int x = pop();
+ int x, y;
+
+ if (_features & GF_HUMONGOUS) {
+ x = pop();
+ y = pop();
+ } else {
+ y = pop();
+ x = pop();
+ }
if (x > _screenWidth - 1) {
push(-1);
@@ -3057,8 +3064,6 @@ void ScummEngine_v6::o6_unknownE1() {
return;
}
- // FIXME: Actually, there is only one virtscr in V7/V8 games anyway.
- // And topline is always 0 for it.
VirtScreen *vs = findVirtScreen(y);
if (vs == NULL) {