[Scummvm-cvs-logs] scummvm master -> 36ab10f291fe3ffbac19cc0175e76ba21aa033f1

dreammaster dreammaster at scummvm.org
Thu Sep 22 12:56:33 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:
36ab10f291 TSAGE: Bugfix for Exit cursor remaining active after leaving motorcycle


Commit: 36ab10f291fe3ffbac19cc0175e76ba21aa033f1
    https://github.com/scummvm/scummvm/commit/36ab10f291fe3ffbac19cc0175e76ba21aa033f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-22T03:50:37-07:00

Commit Message:
TSAGE: Bugfix for Exit cursor remaining active after leaving motorcycle

Changed paths:
    engines/tsage/blue_force/blueforce_scenes0.cpp
    engines/tsage/blue_force/blueforce_scenes0.h



diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index ad748d6..40557d7 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -1097,6 +1097,14 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
 	}
 }
 
+void Scene60::remove() {
+	BF_GLOBALS._player.enableControl();
+	BF_GLOBALS._events.setCursor(_cursorId);
+
+	if (_cursorId == CURSOR_EXIT)
+		BF_GLOBALS._events.setCursor(CURSOR_USE);
+}
+
 void Scene60::signal() {
 	++_sceneMode;
 	BF_GLOBALS._player.enableControl();
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 9c401f3..f3fcbb9 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -177,6 +177,7 @@ public:
 	Scene60();
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
 	virtual void signal();
 	virtual void dispatch();
 };






More information about the Scummvm-git-logs mailing list