diff options
| author | Paul Gilbert | 2013-10-07 18:22:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-10-07 18:22:03 -0400 |
| commit | 6633232467168fc4f4341a2cc03a53d79f0553b1 (patch) | |
| tree | 83ba9699b70c64478107895f0be7a74a923931e3 /engines | |
| parent | b21534b5d11db2022c3dbdf94000f9f035a66853 (diff) | |
| download | scummvm-rg350-6633232467168fc4f4341a2cc03a53d79f0553b1.tar.gz scummvm-rg350-6633232467168fc4f4341a2cc03a53d79f0553b1.tar.bz2 scummvm-rg350-6633232467168fc4f4341a2cc03a53d79f0553b1.zip | |
TSAGE: Fix for R2R bridge character conversations
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index fb7e42f643..1626c4ade2 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -3005,7 +3005,7 @@ bool Scene300::Miranda::startAction(CursorType action, Event &event) { if (!R2_GLOBALS.getFlag(57)) { R2_GLOBALS._events.setCursor(CURSOR_ARROW); scene->_stripManager.start3(434, scene, R2_GLOBALS._stripManager_lookupList); - } else if (R2_GLOBALS._player._characterScene[R2_MIRANDA] != 500) { + } else if (R2_GLOBALS._player._characterScene[R2_SEEKER] != 500) { R2_GLOBALS._events.setCursor(CURSOR_ARROW); scene->_stripManager.start3(407, scene, R2_GLOBALS._stripManager_lookupList); } else { @@ -3138,17 +3138,15 @@ bool Scene300::Quinn::startAction(CursorType action, Event &event) { if (R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500) scene->_stripId = 442; else if (!R2_GLOBALS.getFlag(44)) - scene->_stripId = 177 + R2_GLOBALS._randomSource.getRandomNumber(2); + scene->_stripId = 125 + R2_GLOBALS._randomSource.getRandomNumber(2); else if (!R2_GLOBALS.getFlag(55)) - scene->_stripId = 208; + scene->_stripId = 439; else - scene->_stripId = 441; - } else if (R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500) { - scene->_stripId = 442; + scene->_stripId = 210; } else if (R2_GLOBALS.getFlag(44)) { - scene->_stripId = R2_GLOBALS.getFlag(55) ? 441 : 208; + scene->_stripId = R2_GLOBALS.getFlag(55) ? 439 : 210; } else { - scene->_stripId = 125 + R2_GLOBALS._randomSource.getRandomNumber(2); + scene->_stripId = 177 + R2_GLOBALS._randomSource.getRandomNumber(2); } scene->_stripManager.start3(scene->_stripId, scene, R2_GLOBALS._stripManager_lookupList); |