[Scummvm-cvs-logs] scummvm master -> 2bd4c3c38cc9d5c9337d35d972e53d4b78effc14

Strangerke arnaud.boutonne at gmail.com
Fri Apr 29 22:52:18 CEST 2011


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:
2bd4c3c38c TSAGE: Fix bug in scene 4050: The rope may now be used to climb too


Commit: 2bd4c3c38cc9d5c9337d35d972e53d4b78effc14
    https://github.com/scummvm/scummvm/commit/2bd4c3c38cc9d5c9337d35d972e53d4b78effc14
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-29T13:50:54-07:00

Commit Message:
TSAGE: Fix bug in scene 4050: The rope may now be used to climb too

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



diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp
index 172c2fc..869f77b 100644
--- a/engines/tsage/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld_scenes5.cpp
@@ -2080,6 +2080,7 @@ void Scene4050::Action2::signal() {
 }
 
 void Scene4050::Action3::signal() {
+	// Climb up the rope
 	switch (_actionIndex++) {
 	case 0:
 		ADD_PLAYER_MOVER(210, 185);
@@ -2179,7 +2180,7 @@ void Scene4050::Action4::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-void Scene4050::Hotspot14::doAction(int action) {
+void Scene4050::Hotspot15::doAction(int action) {
 	Scene4050 *scene = (Scene4050 *)_globals->_sceneManager._scene;
 
 	switch (action) {
diff --git a/engines/tsage/ringworld_scenes5.h b/engines/tsage/ringworld_scenes5.h
index e3d1ae0..626eab5 100644
--- a/engines/tsage/ringworld_scenes5.h
+++ b/engines/tsage/ringworld_scenes5.h
@@ -330,7 +330,7 @@ class Scene4050 : public Scene {
 	};
 
 	/* Hotspots */
-	class Hotspot14 : public SceneObject {
+	class Hotspot15 : public SceneObject {
 	public:
 		virtual void doAction(int action);
 	};
@@ -349,8 +349,9 @@ public:
 	DisplayHotspot _hotspot1, _hotspot2, _hotspot3, _hotspot4, _hotspot5;
 	DisplayHotspot _hotspot6, _hotspot7, _hotspot8, _hotspot9, _hotspot10;
 	DisplayHotspot _hotspot11, _hotspot12, _hotspot13;
-	Hotspot14 _hotspot14;
-	SceneObject _hotspot15, _hotspot16;
+	SceneObject _hotspot14;
+	Hotspot15 _hotspot15;
+	SceneObject _hotspot16;
 	Hotspot17 _hotspot17;
 
 	Scene4050();






More information about the Scummvm-git-logs mailing list