diff options
| author | Strangerke | 2014-02-01 13:21:53 +0100 |
|---|---|---|
| committer | Strangerke | 2014-02-01 13:21:53 +0100 |
| commit | 4539eee05f34cf3131926fa21a31a8f8ec50af5f (patch) | |
| tree | aa72244c82eba4941a9883879ff649b196dd930a /engines/tsage/ringworld2 | |
| parent | 4c039ffe893de9d560c78e6fe14702757a99ec43 (diff) | |
| download | scummvm-rg350-4539eee05f34cf3131926fa21a31a8f8ec50af5f.tar.gz scummvm-rg350-4539eee05f34cf3131926fa21a31a8f8ec50af5f.tar.bz2 scummvm-rg350-4539eee05f34cf3131926fa21a31a8f8ec50af5f.zip | |
TSAGE - R2R: Fix bug #6503 (part 2) - The original game have swapped messages for passive short scan geographical and astronomical
Diffstat (limited to 'engines/tsage/ringworld2')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index d59513230d..9b5e6758f5 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -4151,11 +4151,22 @@ void Scene325::signal() { --v; if (_priorConsoleAction == 5) v += 8; + if (R2_GLOBALS.getFlag(51) && (v == 2)) R2_GLOBALS.setFlag(57); if (R2_GLOBALS.getFlag(44) && !R2_GLOBALS.getFlag(51)) { if (v != 13) { + if (_priorConsoleAction == 6) { + // Fix for original game bug. + // The passive short scan geographical and astronomical sentences + // are inverted in the original game. + if (v == 6) + v = 8; + else if (v == 8) + v = 6; + } + setMessage(328, v); } else { _scannerLocation = 864; @@ -4513,6 +4524,7 @@ void Scene325::consoleAction(int id) { case 14: if (R2_GLOBALS.getFlag(55)) { consoleAction(4); + // Workaround for original game bug. // Empty message crashing the game. It should be a warning message forbidding to switch to active scan // SceneItem::display2(329, 17); } else { |