diff options
| author | Max Horn | 2003-01-05 22:16:09 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-05 22:16:09 +0000 |
| commit | a6d89ad7fd490e13da9e815ed64b1d0c0b95d368 (patch) | |
| tree | 659d1524195e9860aedcacccd4e5200253859fec /scumm | |
| parent | 65fdb8fbf0e09ff0eecdc907150a89119caed634 (diff) | |
| download | scummvm-rg350-a6d89ad7fd490e13da9e815ed64b1d0c0b95d368.tar.gz scummvm-rg350-a6d89ad7fd490e13da9e815ed64b1d0c0b95d368.tar.bz2 scummvm-rg350-a6d89ad7fd490e13da9e815ed64b1d0c0b95d368.zip | |
fix for the cannon scene
svn-id: r6339
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v6.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 8ba698c26e..97604887f2 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1101,7 +1101,7 @@ void Scumm_v6::o6_putActorInRoom() if (!a) return; - if (room == 0xFF) { + if (room == 0xFF || room == 0x7FFFFFFF) { room = a->room; } else { if (a->visible && _currentRoom != room && _vars[VAR_TALK_ACTOR] == a->number) { |