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

[dreammaster]

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:
f79b91548d TSAGE: Bugfixes for Scene #2300 - Starship Hanger


Commit: f79b91548de6daf2c3bf9661e2a002b23744e99e
    https://github.com/scummvm/scummvm/commit/f79b91548de6daf2c3bf9661e2a002b23744e99e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-17T05:01:24-07:00

Commit Message:
TSAGE: Bugfixes for Scene #2300 - Starship Hanger

Changed paths:
    engines/tsage/ringworld_scenes3.cpp
    engines/tsage/ringworld_scenes3.h



diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 0cf299c..b4a456e 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -4546,7 +4546,7 @@ void Scene2300::Action2::signal() {
 	case 7:
 		scene->_hotspot7._strip = 2;
 		scene->_hotspot7._frame = 1;
-		scene->_hotspot7.animate(ANIM_MODE_7, this);
+		scene->_hotspot7.animate(ANIM_MODE_5, this);
 		break;
 	case 8:
 		scene->_hotspot2.animate(ANIM_MODE_6, this);
@@ -4672,7 +4672,7 @@ void Scene2300::Hotspot5::doAction(int action) {
 	}
 }
 
-void Scene2300::Hotspot6::doAction(int action) {
+void Scene2300::Hotspot7::doAction(int action) {
 	Scene2300 *scene = (Scene2300 *)_globals->_sceneManager._scene;
 
 	switch (action) {
@@ -4707,7 +4707,7 @@ void Scene2300::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(0, 100, 200, 100);
 
 	_stripManager.addSpeaker(&_speakerSL);
-	_stripManager.addSpeaker(&_speakerML);
+	_stripManager.addSpeaker(&_speakerMText);
 	_stripManager.addSpeaker(&_speakerQText);
 	_stripManager.addSpeaker(&_speakerSText);
 
diff --git a/engines/tsage/ringworld_scenes3.h b/engines/tsage/ringworld_scenes3.h
index 61aac52..85f454a 100644
--- a/engines/tsage/ringworld_scenes3.h
+++ b/engines/tsage/ringworld_scenes3.h
@@ -710,22 +710,14 @@ class Scene2300 : public Scene {
 	public:
 		virtual void doAction(int action);
 	};
-	class Hotspot6 : public SceneObject {
-	public:
-		virtual void doAction(int action);
-	};
-	class Hotspot12 : public SceneObject {
-	public:
-		virtual void doAction(int action);
-	};
-	class Hotspot13 : public SceneObject {
+	class Hotspot7 : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
 public:
 	SoundHandler _soundHandler1, _soundHandler2;
 	SpeakerSL _speakerSL;
-	SpeakerML _speakerML;
+	SpeakerMText _speakerMText;
 	SpeakerQText _speakerQText;
 	SpeakerSText _speakerSText;
 	Action1 _action1;
@@ -734,8 +726,9 @@ public:
 	Action4 _action4;
 	SceneObject _hotspot1, _hotspot2, _hotspot3, _hotspot4;
 	Hotspot5 _hotspot5;
-	Hotspot6 _hotspot6;
-	SceneObject _hotspot7, _hotspot8, _hotspot9, _hotspot10;
+	SceneObject _hotspot6;
+	Hotspot7 _hotspot7;
+	SceneObject _hotspot8, _hotspot9, _hotspot10;
 	DisplayHotspot _hotspot11, _hotspot12, _hotspot13, _hotspot14, _hotspot15;
 
 	Scene2300();