[Scummvm-cvs-logs] scummvm master -> 41af0b0dc8cb6c230524bd05d43c5948fd6416d6

[Strangerke]

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

Summary:
86daaedf96 TSAGE: For consistency, renamed sceneItem1 into Hotspot1 in scene 7000
787f8b4bb6 TSAGE: Finally fix the dialogue bug in scene 4000
41af0b0dc8 TSAGE: Scene 5200 - Suppress dead code (present but not executed in the original)


Commit: 86daaedf964b9c5e7128937848216e6a1891cc7d
    https://github.com/scummvm/scummvm/commit/86daaedf964b9c5e7128937848216e6a1891cc7d
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-06T11:45:43-07:00

Commit Message:
TSAGE: For consistency, renamed sceneItem1 into Hotspot1 in scene 7000

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



diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index 0969ba8..43bff50 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -346,7 +346,7 @@ void Scene7000::Action7::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene7000::SceneItem1::doAction(int action) {
+void Scene7000::Hotspot1::doAction(int action) {
 	if (action == CURSOR_LOOK)
 		SceneItem::display2(7000, 2);
 	else
@@ -608,8 +608,8 @@ void Scene7000::postInit(SceneObjectList *OwnerList) {
 		setAction(&_action3);
 	}
 
-	_sceneItem1.setBounds(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT));
-	_globals->_sceneItems.push_back(&_sceneItem1);
+	_hotspot1.setBounds(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT));
+	_globals->_sceneItems.push_back(&_hotspot1);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/engines/tsage/ringworld_scenes8.h b/engines/tsage/ringworld_scenes8.h
index c40a43e..713520c 100644
--- a/engines/tsage/ringworld_scenes8.h
+++ b/engines/tsage/ringworld_scenes8.h
@@ -95,7 +95,7 @@ class Scene7000 : public Scene {
 	};
 
 	/* Items */
-	class SceneItem1 : public SceneHotspot {
+	class Hotspot1 : public SceneHotspot {
 	public:
 		virtual void doAction(int action);
 	};
@@ -125,7 +125,7 @@ public:
 	Action5 _action5;
 	Action6 _action6;
 	Action7 _action7;
-	SceneItem1  _sceneItem1;
+	Hotspot1  _hotspot1;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();


Commit: 787f8b4bb6a88fc4edff9837ee0e1345a327a1fa
    https://github.com/scummvm/scummvm/commit/787f8b4bb6a88fc4edff9837ee0e1345a327a1fa
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-06T13:31:23-07:00

Commit Message:
TSAGE: Finally fix the dialogue bug in scene 4000

Changed paths:
    engines/tsage/ringworld_scenes5.cpp



diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp
index 10c042c..dd9c33f 100644
--- a/engines/tsage/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld_scenes5.cpp
@@ -47,7 +47,6 @@ void Scene4000::Action1::signal() {
 		scene->_hotspot5.animate(ANIM_MODE_1, NULL);
 		scene->_hotspot5.setPosition(Common::Point(116, 160));
 
-//		ADD_PLAYER_MOVER_NULL(scene->_hotspot5, 208, 169);
 		Common::Point pt(208, 169);
 		NpcMover *mover = new NpcMover();
 		scene->_hotspot5.addMover(mover, &pt, this);
@@ -102,7 +101,7 @@ void Scene4000::Action1::signal() {
 	}
 	case 4:
 		ADD_MOVER(scene->_miranda, -30, 86);
-		ADD_MOVER(scene->_hotspot5, -40, 86);
+		ADD_MOVER_NULL(scene->_hotspot5, -40, 86);
 		break;
 	case 5:
 		_globals->_soundHandler.startSound(155);


Commit: 41af0b0dc8cb6c230524bd05d43c5948fd6416d6
    https://github.com/scummvm/scummvm/commit/41af0b0dc8cb6c230524bd05d43c5948fd6416d6
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-06T13:38:17-07:00

Commit Message:
TSAGE: Scene 5200 - Suppress dead code (present but not executed in the original)

Changed paths:
    engines/tsage/ringworld_scenes6.cpp



diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index 17f7654..973104a 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1589,9 +1589,6 @@ void Scene5200::Hotspot14::doAction(int action) {
 	case CURSOR_USE:
 		scene->setAction(&scene->_action2);
 		break;
-	default:
-		SceneObject::doAction(action);
-		break;
 	}
 }