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

dreammaster dreammaster at scummvm.org
Tue Oct 11 12:34:37 CEST 2011


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

Summary:
97e2430d01 TSAGE: Fix for not resetting scrollFollower when leaving the map screen
31d1385d65 TSAGE: Bugfix for drawing UI correctly when in a side scrolling screen
bdfdac7bfa TSAGE: Bugfix for being able to leave Child Protective Services offices
a52f090b7b TSAGE: Bugfixes for Blue Force scene 710 - Beach


Commit: 97e2430d0134a664e808f97039b865a52626ea7c
    https://github.com/scummvm/scummvm/commit/97e2430d0134a664e808f97039b865a52626ea7c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-11T03:23:57-07:00

Commit Message:
TSAGE: Fix for not resetting scrollFollower when leaving the map screen

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



diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index a4d9bc5..bf4f74d 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -421,6 +421,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
 void Scene50::remove() {
 	// Blank out the screen
 	clearScreen();
+	BF_GLOBALS._scrollFollower = &BF_GLOBALS._player;
 
 	SceneExt::remove();
 	BF_GLOBALS._uiElements._active = true;


Commit: 31d1385d652101bba41f19b18bd6d055874b3914
    https://github.com/scummvm/scummvm/commit/31d1385d652101bba41f19b18bd6d055874b3914
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-11T03:24:33-07:00

Commit Message:
TSAGE: Bugfix for drawing UI correctly when in a side scrolling screen

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



diff --git a/engines/tsage/blue_force/blueforce_ui.cpp b/engines/tsage/blue_force/blueforce_ui.cpp
index fb4008d..9df5c93 100644
--- a/engines/tsage/blue_force/blueforce_ui.cpp
+++ b/engines/tsage/blue_force/blueforce_ui.cpp
@@ -255,6 +255,10 @@ void UICollection::resetClear() {
 
 void UICollection::draw() {
 	if (_visible) {
+		// Temporarily reset the sceneBounds when drawing UI elements to force them on-screen
+		Rect savedBounds = g_globals->_sceneManager._scene->_sceneBounds;
+		g_globals->_sceneManager._scene->_sceneBounds = Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+
 		// Draw the elements onto the background
 		for (uint idx = 0; idx < _objList.size(); ++idx)
 			_objList[idx]->draw();
@@ -265,6 +269,7 @@ void UICollection::draw() {
 			Rect(0, BF_INTERFACE_Y, SCREEN_WIDTH, SCREEN_HEIGHT));
 
 		_clearScreen = 1;
+		g_globals->_sceneManager._scene->_sceneBounds = savedBounds;
 	}
 }
 


Commit: bdfdac7bfaddd80c7393f5ab67483a8e6e7787a6
    https://github.com/scummvm/scummvm/commit/bdfdac7bfaddd80c7393f5ab67483a8e6e7787a6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-11T03:25:18-07:00

Commit Message:
TSAGE: Bugfix for being able to leave Child Protective Services offices

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



diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 9b67159..377fe9e 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -2542,6 +2542,14 @@ void Scene590::process(Event &event) {
 	}
 }
 
+void Scene590::dispatch() {
+	if (!_action && (BF_GLOBALS._player._position.x < 182) && (BF_GLOBALS._player._position.y > 158)) {
+		BF_GLOBALS._player.disableControl();
+		_sceneMode = 2;
+		setAction(&_sequenceManager, this, 5901, &BF_GLOBALS._player, NULL);
+	}
+}
+
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_scenes5.h b/engines/tsage/blue_force/blueforce_scenes5.h
index 8ff5b40..74d193c 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.h
+++ b/engines/tsage/blue_force/blueforce_scenes5.h
@@ -397,6 +397,7 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 	virtual void process(Event &event);
+	virtual void dispatch();
 };
 
 } // End of namespace BlueForce


Commit: a52f090b7b9a5db749986ab4c66d59638ac3fbbd
    https://github.com/scummvm/scummvm/commit/a52f090b7b9a5db749986ab4c66d59638ac3fbbd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-11T03:25:43-07:00

Commit Message:
TSAGE: Bugfixes for Blue Force scene 710 - Beach

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



diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index c9538f6..b945343 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -185,6 +185,7 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
 		// Decking
 		return new Scene690();
 	case 710:
+		// Beach
 		return new Scene710();
 	case 800:
 		// Jamison & Ryan
diff --git a/engines/tsage/blue_force/blueforce_scenes7.cpp b/engines/tsage/blue_force/blueforce_scenes7.cpp
index 1d94211..2ced7ce 100644
--- a/engines/tsage/blue_force/blueforce_scenes7.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes7.cpp
@@ -31,9 +31,10 @@ namespace TsAGE {
 namespace BlueForce {
 
 /*--------------------------------------------------------------------------
- * Scene 710 - 
+ * Scene 710 - Beach
  *
  *--------------------------------------------------------------------------*/
+
 void Scene710::Timer1::signal() {
 	PaletteRotation *rotation = BF_GLOBALS._scenePalette.addRotation(136, 138, -1);
 	rotation->setDelay(25);
@@ -58,8 +59,7 @@ void Scene710::Action1::signal() {
 		setDelay(3);
 		break;
 	case 1: {
-		PlayerMover *mover = new PlayerMover();
-		BF_GLOBALS._player.addMover(mover, &scene->_laura._position, scene);
+		ADD_MOVER(BF_GLOBALS._player, scene->_laura._position.x + 8, scene->_laura._position.y + 8);
 		break;
 		}
 	case 2:
@@ -67,7 +67,7 @@ void Scene710::Action1::signal() {
 		scene->_stripManager.start(_state, this);
 		break;
 	case 3:
-		if (_state == 7105)
+		if (_state != 7105)
 			BF_GLOBALS._player.enableControl();
 		else {
 			BF_GLOBALS._player.disableControl();
@@ -76,7 +76,7 @@ void Scene710::Action1::signal() {
 		}
 		if (_state < 7104) {
 			_state++;
-			if ((_state != 7104) && (BF_INVENTORY.getObjectScene(INV_CRATE1) == 1))
+			if ((_state == 7104) && (BF_INVENTORY.getObjectScene(INV_CRATE1) == 1))
 					_state = 7105;
 		}
 		remove();
@@ -101,7 +101,7 @@ bool Scene710::Object4::startAction(CursorType action, Event &event) {
 	Scene710 *scene = (Scene710 *)BF_GLOBALS._sceneManager._scene;
 
 	if ((action == CURSOR_LOOK) && (scene->_kid._position.x < 0)) {
-		SceneItem::display(710, 13);
+		SceneItem::display2(710, 13);
 		return true;
 	} else
 		return NamedObject::startAction(action, event);
@@ -116,7 +116,7 @@ bool Scene710::Object5::startAction(CursorType action, Event &event) {
 		if (scene->_v1D64 <= 2)
 			return NamedObject::startAction(action, event);
 		else {
-			SceneItem::display(710, 3);
+			SceneItem::display2(710, 3);
 			scene->_v1D66 = 1;
 			return true;
 		}
@@ -144,8 +144,8 @@ bool Scene710::Object5::startAction(CursorType action, Event &event) {
 void Scene710::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	loadScene(710);
-
 	_sceneBounds.moveTo(320, 0);
+
 	BF_GLOBALS._sound1.fadeSound(14);
 	_soundExt1.fadeSound(48);
 	_v51C34.set(40, 0, 280, 240);
@@ -195,7 +195,7 @@ void Scene710::postInit(SceneObjectList *OwnerList) {
 }
 
 void Scene710::signal() {
-	switch (_sceneMode++) {
+	switch (_sceneMode) {
 	case 0:
 		BF_GLOBALS._player.enableControl();
 		break;
@@ -206,7 +206,7 @@ void Scene710::signal() {
 		break;
 	case 7101:
 		BF_GLOBALS._player.enableControl();
-		BF_INVENTORY.setObjectScene(288, 36);
+		BF_INVENTORY.setObjectScene(INV_CRATE1, 1);
 		_stick.remove();
 		BF_GLOBALS._walkRegions.proc2(2);
 		break;
diff --git a/engines/tsage/blue_force/blueforce_scenes7.h b/engines/tsage/blue_force/blueforce_scenes7.h
index 9bb4345..91bd1e5 100644
--- a/engines/tsage/blue_force/blueforce_scenes7.h
+++ b/engines/tsage/blue_force/blueforce_scenes7.h
@@ -91,10 +91,10 @@ public:
 	NamedHotspot _item9;
 	int _v1D62, _v1D64, _v1D66, _v1D68;
 
-	void postInit(SceneObjectList *OwnerList = NULL);
-	void signal();
-	void dispatch();
-	void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
 };
 
 } // End of namespace BlueForce






More information about the Scummvm-git-logs mailing list