[Scummvm-cvs-logs] scummvm master -> 10ee61fd37b2e8fcddf425e921f1966d40437243

[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:
10ee61fd37 TSAGE: Fix a bug in scene 7000, after talking to Skeenar


Commit: 10ee61fd37b2e8fcddf425e921f1966d40437243
    https://github.com/scummvm/scummvm/commit/10ee61fd37b2e8fcddf425e921f1966d40437243
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-29T15:36:56-07:00

Commit Message:
TSAGE: Fix a bug in scene 7000, after talking to Skeenar

Changed paths:
    engines/tsage/ringworld_scenes8.cpp



diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index 8fa3582..934c749 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -48,6 +48,7 @@ void SceneObject7700::synchronize(Serializer &s) {
  *--------------------------------------------------------------------------*/
 
 void Scene7000::Action1::signal() {
+	// Quinn walks from the lander to the seaside (action6) then discuss with Skeenar
 	Scene7000 *scene = (Scene7000 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -125,6 +126,7 @@ void Scene7000::Action3::dispatch() {
 /*--------------------------------------------------------------------------*/
 
 void Scene7000::Action3::signal() {
+	// Lander is landing
 	Scene7000 *scene = (Scene7000 *)_globals->_sceneManager._scene;
 
 	switch (_actionIndex++) {
@@ -260,6 +262,7 @@ void Scene7000::Action5::signal() {
 /*--------------------------------------------------------------------------*/
 
 void Scene7000::Action6::signal() {
+	// Quinn walks from the lander to the seaside
 	switch (_actionIndex++) {
 	case 0:
 		_globals->_player.disableControl();
@@ -361,6 +364,7 @@ void Scene7000::Hotspot1::doAction(int action) {
 /*--------------------------------------------------------------------------*/
 
 void Scene7000::Object1::doAction(int action) {
+	// Skeenar
 	Scene7000 *scene = (Scene7000 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -439,10 +443,10 @@ void Scene7000::Object1::doAction(int action) {
 			scene->_sceneMode = 7005;
 			scene->setAction(&scene->_sequenceManager, scene, 7013, NULL);
 		} else if (_globals->getFlag(13)) {
-			_globals->_sceneManager._sceneNumber = 7002;
+			scene->_sceneMode = 7002;
 			scene->setAction(&scene->_sequenceManager, scene, 7014, NULL);
 		} else {
-			_globals->_sceneManager._sceneNumber = 7002;
+			scene->_sceneMode = 7002;
 			scene->setAction(&scene->_sequenceManager, scene, 7002, NULL);
 		}
 		break;