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

dreammaster dreammaster at scummvm.org
Fri May 6 14:56:31 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:
d77502eaf4 TSAGE: Bugfix for hotspot issues in Scene #7000


Commit: d77502eaf41b0bfc18fa22a23938e7d619f9e16c
    https://github.com/scummvm/scummvm/commit/d77502eaf41b0bfc18fa22a23938e7d619f9e16c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-06T05:54:54-07:00

Commit Message:
TSAGE: Bugfix for hotspot issues 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 fbed069..0969ba8 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -349,8 +349,8 @@ void Scene7000::Action7::signal() {
 void Scene7000::SceneItem1::doAction(int action) {
 	if (action == CURSOR_LOOK)
 		SceneItem::display2(7000, 2);
-
-	SceneItem::doAction(action);
+	else
+		SceneHotspot::doAction(action);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/engines/tsage/ringworld_scenes8.h b/engines/tsage/ringworld_scenes8.h
index a88a01b..c40a43e 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 SceneItem {
+	class SceneItem1 : public SceneHotspot {
 	public:
 		virtual void doAction(int action);
 	};






More information about the Scummvm-git-logs mailing list