[Scummvm-cvs-logs] scummvm master -> 4539eee05f34cf3131926fa21a31a8f8ec50af5f

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4539eee05f TSAGE - R2R: Fix bug #6503 (part 2) - The original game have swapped messages for passive short scan geographical and as


Commit: 4539eee05f34cf3131926fa21a31a8f8ec50af5f
    https://github.com/scummvm/scummvm/commit/4539eee05f34cf3131926fa21a31a8f8ec50af5f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-01T04:21:53-08:00

Commit Message:
TSAGE - R2R: Fix bug #6503 (part 2) - The original game have swapped messages for passive short scan geographical and astronomical

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index d595132..9b5e675 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 {