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

[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:
e73ee45717 TSAGE: R2R Demo - Add some more code specifically for R2R Demo


Commit: e73ee457179330cfbc3795a155a56b448afc0170
    https://github.com/scummvm/scummvm/commit/e73ee457179330cfbc3795a155a56b448afc0170
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-01-02T22:47:00-08:00

Commit Message:
TSAGE: R2R Demo - Add some more code specifically for R2R Demo

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 7fdc1dc..3a72462 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3550,7 +3550,11 @@ void Scene300::signal() {
 				R2_GLOBALS.setFlag(40);
 			break;
 		case 6:
-			R2_GLOBALS._sceneManager.changeScene(1000);
+			if (g_vm->getFeatures() & GF_DEMO) {
+				R2_GLOBALS.setFlag(85);
+				R2_GLOBALS._sceneManager.changeScene(205);
+			} else
+				R2_GLOBALS._sceneManager.changeScene(1000);
 			break;
 		default:
 			break;
@@ -3611,8 +3615,14 @@ void Scene300::signal() {
 
 	case 16:
 		if (_stripManager._exitMode == 1) {
-			R2_GLOBALS._player.setAction(NULL);
-			R2_GLOBALS._sceneManager.changeScene(1000);
+			if (g_vm->getFeatures() & GF_DEMO) {
+				R2_GLOBALS._player.setAction(NULL);
+				R2_GLOBALS.setFlag(85);
+				R2_GLOBALS._sceneManager.changeScene(205);
+			} else {
+				R2_GLOBALS._player.setAction(NULL);
+				R2_GLOBALS._sceneManager.changeScene(1000);
+			}
 		} else {
 			R2_GLOBALS._player.setAction(&_action1);
 			R2_GLOBALS._player.enableControl(CURSOR_TALK);