[Scummvm-cvs-logs] scummvm master -> 5bf59d7d161a5da383f9d87e45e5655e4c51d09b

[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:
505c04701f TSAGE: Added missing code for SceneExt::remove
5bf59d7d16 TSAGE: Bugfix for showing UI Elements when starting up game from title screen


Commit: 505c04701f95c4a5f98d821892e8a121d5478f8d
    https://github.com/scummvm/scummvm/commit/505c04701f95c4a5f98d821892e8a121d5478f8d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-09T03:04:15-07:00

Commit Message:
TSAGE: Added missing code for SceneExt::remove

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



diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index b5465e7..87f1614 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -681,6 +681,21 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 	}
 }
 
+void SceneExt::remove() {
+	BF_GLOBALS._uiElements.hide();
+	BF_GLOBALS._uiElements.resetClear();
+
+	// Below code originally in Blue Force Scene::remove(). Placed here to avoid contaminating
+	// core class with Blue Force specific code
+	if (_action) {
+		if (_action->_endHandler)
+			_action->_endHandler = NULL;
+		_action->remove();
+	}
+	
+	_focusObject = NULL;
+}
+
 void SceneExt::process(Event &event) {
 	_objArray2.process(event);
 	if (!event.handled)
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index dcaea52..a39e19a 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -211,6 +211,7 @@ public:
 
 	virtual Common::String getClassName() { return "SceneExt"; }
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
 	virtual void process(Event &event);
 	virtual void dispatch();
 	virtual void loadScene(int sceneNum);


Commit: 5bf59d7d161a5da383f9d87e45e5655e4c51d09b
    https://github.com/scummvm/scummvm/commit/5bf59d7d161a5da383f9d87e45e5655e4c51d09b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-09T03:07:05-07:00

Commit Message:
TSAGE: Bugfix for showing UI Elements when starting up game from title screen

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



diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index 0d54826..7ddd913 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -623,6 +623,7 @@ void Scene190::postInit(SceneObjectList *OwnerList) {
 		default:
 			BF_GLOBALS.setFlag(onBike);
 			BF_GLOBALS._player.disableControl();
+			BF_GLOBALS._uiElements._active = true;
 			_sceneMode = BF_GLOBALS.getFlag(onDuty) ? 192 : 190;
 			setAction(&_sequenceManager, this, _sceneMode, &BF_GLOBALS._player, NULL);
 			break;