[Scummvm-cvs-logs] scummvm master -> d16ba4366926b94c3bfb5bde9f323796fb159ed6

[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:
d16ba43669 TSAGE: R2R - Fix a crash when switching from active to passive scan after visiting canyon people


Commit: d16ba4366926b94c3bfb5bde9f323796fb159ed6
    https://github.com/scummvm/scummvm/commit/d16ba4366926b94c3bfb5bde9f323796fb159ed6
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-12T23:49:31-08:00

Commit Message:
TSAGE: R2R - Fix a crash when switching from active to passive scan after visiting canyon people

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 d326058..3cddb07 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4436,7 +4436,9 @@ void Scene325::consoleAction(int id) {
 		return;
 	case 14:
 		if (R2_GLOBALS.getFlag(55)) {
-			SceneItem::display2(329, 17);
+			consoleAction(4);
+			// Empty message crashing the game. It should be a warning message forbidding to switch to active scan
+			// SceneItem::display2(329, 17);
 		} else {
 			R2_GLOBALS.setFlag(50);
 			consoleAction(4);