aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-24 23:08:03 +0000
committerMax Horn2003-05-24 23:08:03 +0000
commit0d2ddf238103a1bc8948900c75e77bf444414207 (patch)
tree7c1675535c783ce77fe3d91a0ad2e80de72ed2b8 /scumm/script_v6.cpp
parentfcb5cf36c98655b7c02d00c4aa68cf89f0928198 (diff)
downloadscummvm-rg350-0d2ddf238103a1bc8948900c75e77bf444414207.tar.gz
scummvm-rg350-0d2ddf238103a1bc8948900c75e77bf444414207.tar.bz2
scummvm-rg350-0d2ddf238103a1bc8948900c75e77bf444414207.zip
work around for comi script calling o6_getActorRoom(255)
svn-id: r7912
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 02c59bb461..c141422280 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1203,6 +1203,12 @@ void Scumm_v6::o6_getActorRoom() {
return;
}
+ if (act == 255) {
+ // This case also occurs in COMI...
+ push(0);
+ return;
+ }
+
Actor *a = derefActor(act, "o6_getActorRoom");
push(a->room);
}