diff options
| author | Paul Gilbert | 2013-11-13 07:56:56 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-13 07:56:56 -0500 |
| commit | 601e18023c0ea2c0b7829421bc361362d5945875 (patch) | |
| tree | 29ca77615a530e3e91547fb9065fa2398e2087e8 | |
| parent | 9a0c24fa12b3f7049c6ac36e62f5043e201b3efa (diff) | |
| download | scummvm-rg350-601e18023c0ea2c0b7829421bc361362d5945875.tar.gz scummvm-rg350-601e18023c0ea2c0b7829421bc361362d5945875.tar.bz2 scummvm-rg350-601e18023c0ea2c0b7829421bc361362d5945875.zip | |
TSAGE: Fix for R2R spaceport check for when to trigger ARM arriving cutscene
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 7c82769763..142ebbe1df 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -8662,6 +8662,8 @@ void Scene1550::enterArea() { int varA = 0; + // This section handles checks if the ARM spacecraft have not yet seized + // control of Lance of Truth. if (!R2_GLOBALS.getFlag(16)) { switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y - 2) { case 0: @@ -8754,7 +8756,11 @@ void Scene1550::enterArea() { default: break; } - if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 0) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x <= 29) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x >= 20) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 7)) { + if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 0) && + (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x <= 29) && + ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x < 20) || + (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 7))) { + // In an area where the cutscene can be triggered, so start it R2_GLOBALS.setFlag(16); R2_GLOBALS._sceneManager.changeScene(1500); } |