[Scummvm-cvs-logs] scummvm master -> 818c85948e418c7f02f53feca34102b171ab3ce5

[dreammaster]

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

Summary:
3bf8eb4e3e TSAGE: Bugfix for Blue Force named hotspots to display look/use/talk descriptions correctly
818c85948e TSAGE: Bugfix for showing cursor correctly in Blue Force scene 930


Commit: 3bf8eb4e3e59439cb90a4a8fa7b10c8be360d019
    https://github.com/scummvm/scummvm/commit/3bf8eb4e3e59439cb90a4a8fa7b10c8be360d019
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2012-03-04T00:37:45-08:00

Commit Message:
TSAGE: Bugfix for Blue Force named hotspots to display look/use/talk descriptions correctly

Changed paths:
    engines/tsage/blue_force/blueforce_logic.h



diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 04c6e9b..59bc2b7 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -119,9 +119,6 @@ public:
 
 class NamedObject: public SceneObject {
 public:
-	int _resNum;
-	int _lookLineNum, _talkLineNum, _useLineNum;
-
 	virtual Common::String getClassName() { return "NamedObject"; }
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);


Commit: 818c85948e418c7f02f53feca34102b171ab3ce5
    https://github.com/scummvm/scummvm/commit/818c85948e418c7f02f53feca34102b171ab3ce5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2012-03-04T00:38:25-08:00

Commit Message:
TSAGE: Bugfix for showing cursor correctly in Blue Force scene 930

Changed paths:
    engines/tsage/blue_force/blueforce_scenes9.cpp



diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index a303576..a63ff7e 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -3375,6 +3375,7 @@ void Scene930::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player.fixPriority(80);
 	BF_GLOBALS._player.changeZoom(-1);
 	BF_GLOBALS._player.enableControl();
+	BF_GLOBALS._events.setCursor(CURSOR_WALK);
 
 	_item1.setDetails(  1, 930,  0,  1,  2, 1);
 	_item2.setDetails(  2, 930,  4,  5,  6, 1);