Skip to content

Commit

Permalink
TSAGE - R2R: Fix bug #6503 (part 2) - The original game have swapped …
Browse files Browse the repository at this point in the history
…messages for passive short scan geographical and astronomical
  • Loading branch information
Strangerke committed Feb 1, 2014
1 parent 4c039ff commit 4539eee
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions engines/tsage/ringworld2/ringworld2_scenes0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 4539eee

Please sign in to comment.