aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-14 10:14:05 +0000
committerMax Horn2003-05-14 10:14:05 +0000
commit86b916b76237e2787c822ed67f81a829c4307526 (patch)
tree22d36d7eb7999c568dc382260daeeb98efa3cb99 /scumm/script_v6.cpp
parentafe038d6dd03ff8b4028b3c95cb9a7c873dd8b65 (diff)
downloadscummvm-rg350-86b916b76237e2787c822ed67f81a829c4307526.tar.gz
scummvm-rg350-86b916b76237e2787c822ed67f81a829c4307526.tar.bz2
scummvm-rg350-86b916b76237e2787c822ed67f81a829c4307526.zip
V8 fix
svn-id: r7496
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index d25454e212..6d2a664770 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1134,9 +1134,11 @@ void Scumm_v6::o6_loadRoomWithEgo() {
a->putActor(0, 0, room);
_egoPositioned = false;
- VAR(VAR_WALKTO_OBJ) = obj;
+ if (VAR_WALKTO_OBJ != 0xFF)
+ VAR(VAR_WALKTO_OBJ) = obj;
startScene(a->room, a, obj);
- VAR(VAR_WALKTO_OBJ) = 0;
+ if (VAR_WALKTO_OBJ != 0xFF)
+ VAR(VAR_WALKTO_OBJ) = 0;
/* startScene maybe modifies VAR_EGO, i hope not */