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

[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:
30dd2db8fe TSAGE: Implemented Blue Force scene 265 - Graduation Article
5e8562d373 TSAGE: Fixed compiler warnings


Commit: 30dd2db8fe8c19a0fe2c8ff5784a7e5e8ee1d878
    https://github.com/scummvm/scummvm/commit/30dd2db8fe8c19a0fe2c8ff5784a7e5e8ee1d878
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-02T05:39:42-07:00

Commit Message:
TSAGE: Implemented Blue Force scene 265 - Graduation Article

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



diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index caaa530..6f3a0f1 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -92,6 +92,8 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
 		// Credits - Gun Training
 		return new Scene225();
 	case 265:
+		// Graduation Article
+		return new Scene265();
 	case 270:
 	case 271:
 	case 280:
@@ -786,6 +788,10 @@ void SceneExt::endStrip() {
 	}
 }
 
+void SceneExt::clearScreen() {
+	BF_GLOBALS._screenSurface.fillRect(BF_GLOBALS._screenSurface.getBounds(), 0);
+}
+
 /*--------------------------------------------------------------------------*/
 
 PalettedScene::PalettedScene(): SceneExt() {
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 969e4ab..3fa7bee 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -221,6 +221,7 @@ public:
 	bool display(CursorType action);
 	void fadeOut();
 	void gunDisplay();
+	void clearScreen();
 };
 
 class PalettedScene: public SceneExt {
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 8d58d55..1e8c535 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -419,7 +419,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
 
 void Scene50::remove() {
 	// Blank out the screen
-	BF_GLOBALS._screenSurface.fillRect(BF_GLOBALS._screenSurface.getBounds(), 0);
+	clearScreen();
 
 	SceneExt::remove();
 	BF_GLOBALS._uiElements._active = true;
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 3672b6e..f201e58 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -707,6 +707,55 @@ void Scene225::remove() {
 	SceneExt::remove();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 265 - Graduation Article
+ *
+ *--------------------------------------------------------------------------*/
+
+void Scene265::Action1::signal() {
+	switch (_actionIndex++) {
+	case 0:
+		BF_GLOBALS._scenePalette.loadPalette(2);
+		setDelay(30);
+		break;
+	case 1:
+		BF_GLOBALS._scenePalette.refresh();
+		setDelay(240);
+		break;
+	case 2:
+		ADD_MOVER(BF_GLOBALS._player, 160, 280);
+		break;
+	case 3:
+		// Wait until sound finishes playing
+		if (BF_GLOBALS._sound1.isPlaying())
+			_actionIndex = 3;
+		setDelay(1);
+		break;
+	case 4:
+		BF_GLOBALS._dayNumber = 1;
+		BF_GLOBALS._sceneManager.changeScene(190);
+		break;
+	default:
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+void Scene265::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(265);
+
+	BF_GLOBALS._player.postInit();
+	BF_GLOBALS._player.setPosition(Common::Point(160, 100));
+	BF_GLOBALS._player.hide();
+	setAction(&_action1);
+}
+
+void Scene265::remove() {
+	clearScreen();
+	remove();
+}
 
 } // End of namespace BlueForce
 
diff --git a/engines/tsage/blue_force/blueforce_scenes2.h b/engines/tsage/blue_force/blueforce_scenes2.h
index 4b1ebba..15f9487 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.h
+++ b/engines/tsage/blue_force/blueforce_scenes2.h
@@ -152,6 +152,19 @@ public:
 	virtual void remove();
 };
 
+class Scene265: public SceneExt {
+	/* Actions */
+	class Action1: public ActionExt {
+	public:
+		virtual void signal();
+	};
+public:
+	Action1 _action1;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+};
+
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE


Commit: 5e8562d373c99e980ff64ceb1763b5e3b02ffdf1
    https://github.com/scummvm/scummvm/commit/5e8562d373c99e980ff64ceb1763b5e3b02ffdf1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-02T05:41:15-07:00

Commit Message:
TSAGE: Fixed compiler warnings

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



diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index f201e58..524c742 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -36,7 +36,7 @@ namespace BlueForce {
 void Scene200::Action1::signal() {
 	Scene200 *scene = (Scene200 *)BF_GLOBALS._sceneManager._scene;
 	SceneObject *owner = static_cast<SceneObject *>(this->_owner);
-	static const uint32 black = 0;
+
 	assert(owner);
 
 	switch (_actionIndex++) {
@@ -452,8 +452,8 @@ void Scene225::Action1::signal() {
 		owner->_moveDiff.x = 8;
 
 		Common::Point destPos(402, 116);
-		NpcMover *mover = new NpcMover();
-		owner->addMover(mover, &destPos, this);
+		NpcMover *mover2 = new NpcMover();
+		owner->addMover(mover2, &destPos, this);
 
 		BF_GLOBALS._player.setPosition(Common::Point(owner->_position.x, 0));
 		ADD_MOVER_NULL(BF_GLOBALS._player, 500, 0);