diff options
| author | Travis Howell | 2005-04-06 05:04:39 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-06 05:04:39 +0000 |
| commit | c66e6bb001f62a9c04951ffd1972dc68de3d44ef (patch) | |
| tree | 12cb7ecff7ad47b15615feab7e193edde0c46218 /scumm/script_v5.cpp | |
| parent | de94c2411a908d0c216470896e113a96d53a1d1e (diff) | |
| download | scummvm-rg350-c66e6bb001f62a9c04951ffd1972dc68de3d44ef.tar.gz scummvm-rg350-c66e6bb001f62a9c04951ffd1972dc68de3d44ef.tar.bz2 scummvm-rg350-c66e6bb001f62a9c04951ffd1972dc68de3d44ef.zip | |
This section of startScene only exists in scumm5 onwards.
svn-id: r17409
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 6430843e18..0e06bf0d0b 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1507,6 +1507,8 @@ void ScummEngine_v5::o5_loadRoomWithEgo() { VAR(VAR_WALKTO_OBJ) = 0; if (_version <= 4) { + if (whereIsObject(obj) != WIO_ROOM) + error("startScene: Object %d is not in room %d", obj, _currentRoom); if (!_egoPositioned) { getObjectXYPos(obj, x2, y2, dir); a->putActor(x2, y2, _currentRoom); |