diff options
| author | Max Horn | 2003-07-02 14:21:13 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-02 14:21:13 +0000 |
| commit | a60998900840f48f00a793dd48c1f838368cb8b2 (patch) | |
| tree | 2b226b0e7f24beafb081f4aa4a06824aa1ab3ecd /scumm | |
| parent | 4efbf666af67c529b61e54f51f910da8fe156300 (diff) | |
| download | scummvm-rg350-a60998900840f48f00a793dd48c1f838368cb8b2.tar.gz scummvm-rg350-a60998900840f48f00a793dd48c1f838368cb8b2.tar.bz2 scummvm-rg350-a60998900840f48f00a793dd48c1f838368cb8b2.zip | |
fix o2_loadRoomWithEgo regression (this bug was uncovered by my previous adjustXYToBeInBox improvment)
svn-id: r8713
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index cd87c62598..af7c62030f 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -1134,8 +1134,8 @@ void Scumm_v2::o2_loadRoomWithEgo() { a->putActor(0, 0, room); _egoPositioned = false; - x = (int16)fetchScriptByte() * 8; - y = (int16)fetchScriptByte() * 2; + x = (int8)fetchScriptByte() * 8; + y = (int8)fetchScriptByte() * 2; startScene(a->room, a, obj); @@ -1147,7 +1147,7 @@ void Scumm_v2::o2_loadRoomWithEgo() { resetSentence(); - if (x != -1) { + if (x >= 0 && y >= 0) { a->startWalkActor(x, y, -1); } runScript(5, 0, 0, 0); @@ -1217,7 +1217,7 @@ void Scumm_v2::o2_cutscene() { //warning("TODO o2_cutscene()"); vm.cutSceneData[0] = _userState; - vm.cutSceneData[1] = (int16) VAR(VAR_CURSORSTATE); + vm.cutSceneData[1] = (int16)VAR(VAR_CURSORSTATE); vm.cutSceneData[2] = _currentRoom; vm.cutSceneData[3] = camera._mode; |