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

[Strangerke]

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

Summary:
a2cad5a3d0 TSAGE: Little modification in order to match the executable in scene 6100
c0d70b6dbb TSAGE: Fix a valgrind warning in SceneObject initialization


Commit: a2cad5a3d0fad607176c67eda26d6b12b01f5abf
    https://github.com/scummvm/scummvm/commit/a2cad5a3d0fad607176c67eda26d6b12b01f5abf
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-06-01T10:01:48-07:00

Commit Message:
TSAGE: Little modification in order to match the executable in scene 6100

Changed paths:
    engines/tsage/ringworld_scenes1.cpp



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index b6daadb..82f0153 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -2999,6 +2999,13 @@ void Scene6100::Action5::dispatch() {
 		if ((idx != 3) && (scene->_fadePercent == 100) &&
 				(tempSet.sqrt(zeroSet) < 150.0)) {
 			switch (scene->_hitCount++) {
+			case 0:
+				scene->_soundHandler.startSound(233);
+				scene->showMessage(NULL, 0, NULL);
+
+				if (!_globals->getFlag(76))
+					scene->_probe.setAction(&scene->_action1);
+				break;
 			case 1:
 				scene->_soundHandler.startSound(233);
 				scene->showMessage(NULL, 0, NULL);
@@ -3006,7 +3013,6 @@ void Scene6100::Action5::dispatch() {
 				if (!_globals->getFlag(76))
 					scene->_probe.setAction(&scene->_action2);
 				break;
-
 			case 2:
 				scene->_soundHandler.startSound(234);
 				scene->showMessage(NULL, 0, NULL);
@@ -3015,14 +3021,6 @@ void Scene6100::Action5::dispatch() {
 					scene->_probe.setAction(NULL);
 				scene->setAction(&scene->_action3);
 				break;
-
-			default:
-				scene->_soundHandler.startSound(233);
-				scene->showMessage(NULL, 0, NULL);
-
-				if (!_globals->getFlag(76))
-					scene->_probe.setAction(&scene->_action1);
-				break;
 			}
 
 			_globals->_scenePalette.clearListeners();


Commit: c0d70b6dbb4dc18b74e810015472eae30785ec69
    https://github.com/scummvm/scummvm/commit/c0d70b6dbb4dc18b74e810015472eae30785ec69
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-06-01T10:04:38-07:00

Commit Message:
TSAGE: Fix a valgrind warning in SceneObject initialization

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 8c1bd2f..ae33776 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1688,6 +1688,7 @@ SceneObject::SceneObject() : SceneHotspot() {
 	_flags |= OBJFLAG_PANES;
 
 	_frameChange = 0;
+	_visage = 0;
 }
 
 SceneObject::SceneObject(const SceneObject &so) : SceneHotspot() {