diff options
| author | Paul Gilbert | 2013-09-15 23:25:17 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-09-15 23:25:17 -0400 |
| commit | 89055ab9a079ed710356862878d0bc66fdaaa840 (patch) | |
| tree | 8df86b004dee7e9566751c58b71e34c83ca184cb /engines/tsage/ringworld2/ringworld2_logic.cpp | |
| parent | d837605477ce7d945d4f3bc1ecbf48eb89549e7c (diff) | |
| download | scummvm-rg350-89055ab9a079ed710356862878d0bc66fdaaa840.tar.gz scummvm-rg350-89055ab9a079ed710356862878d0bc66fdaaa840.tar.bz2 scummvm-rg350-89055ab9a079ed710356862878d0bc66fdaaa840.zip | |
TSAGE: Bugfixes and renaming for R2R desert
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_logic.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index e679b3835c..013abfa4a4 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -294,6 +294,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) { // Cutscene - Teleport outside return new Scene3700(); case 3800: + // Desert return new Scene3800(); case 3900: return new Scene3900(); @@ -2290,13 +2291,13 @@ void ScannerDialog::Button::reset() { break; case 3800: case 3900: - if ((R2_GLOBALS._v56A93 + 1) == 0 && R2_GLOBALS._v566A9 == 0) { + if ((R2_GLOBALS._desertWrongDirCtr + 1) == 0 && R2_GLOBALS._desertCorrectDirection == 0) { do { - R2_GLOBALS._v566A9 = R2_GLOBALS._randomSource.getRandomNumber(3); - } while (R2_GLOBALS._v566A9 == R2_GLOBALS._v566AA); + R2_GLOBALS._desertCorrectDirection = R2_GLOBALS._randomSource.getRandomNumber(3) + 1; + } while (R2_GLOBALS._desertCorrectDirection == R2_GLOBALS._desertPreviousDirection); } - scanner._obj4.setup(4, 7, R2_GLOBALS._v566A9); + scanner._obj4.setup(4, 7, R2_GLOBALS._desertCorrectDirection); if (!R2_GLOBALS.getFlag(46)) R2_GLOBALS.setFlag(46); break; |