diff options
| author | Paul Gilbert | 2013-08-25 16:49:49 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-08-25 16:49:49 -0400 |
| commit | c9115241dea8d1e741003da671e4d4df6d2ccf68 (patch) | |
| tree | 5de8e100815014ebaf843a7f9bc4a86f7bd9278d /engines | |
| parent | 67cbb88d42228a310089cb6269d0ac44e396d3a6 (diff) | |
| download | scummvm-rg350-c9115241dea8d1e741003da671e4d4df6d2ccf68.tar.gz scummvm-rg350-c9115241dea8d1e741003da671e4d4df6d2ccf68.tar.bz2 scummvm-rg350-c9115241dea8d1e741003da671e4d4df6d2ccf68.zip | |
TSAGE: Fix to the R2R scene 1550 junk display loop
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tsage/globals.h | 5 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 7dac8aa599..839895cea5 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -242,11 +242,6 @@ namespace Ringworld2 { #define SPEECH_TEXT 1 #define SPEECH_VOICE 2 -#define k5A78C 15 -#define k5A78D 16 -#define k5A790 18 -#define k5A791 17 - class ScannerDialog; class Ringworld2Globals: public TsAGE2Globals { diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index d277add68a..4ecb33e307 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -8990,7 +8990,7 @@ void Scene1550::enterArea() { int di = 0; int tmpIdx = 0; - for (int i = 0; i < 129 * 4; i += 4) { + for (int i = 0; i < 127 * 4; i += 4) { if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == R2_GLOBALS._scene1550JunkLocations[i]) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == R2_GLOBALS._scene1550JunkLocations[i + 1]) && (R2_GLOBALS._scene1550JunkLocations[i + 2] != 0)) { @@ -9006,10 +9006,10 @@ void Scene1550::enterArea() { _junk[di].setPosition(Common::Point(150, 70)); _junk[di].setup(1562, 1, 1); - R2_GLOBALS._walkRegions.enableRegion(k5A78C); - R2_GLOBALS._walkRegions.enableRegion(k5A78D); - R2_GLOBALS._walkRegions.enableRegion(k5A790); - R2_GLOBALS._walkRegions.enableRegion(k5A791); + R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[2]); + R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[3]); + R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[6]); + R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[7]); if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) { _actor9.postInit(); |