TSAGE: Implemented Blue Force scene 385 - City Hall

7 files changed, 560 insertions, 7 deletions

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 51e891cc48..0fbe647a8b 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -110,6 +110,8 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
 	case 370:
 	case 380:
 	case 385:
+		// City Hall
+		return new Scene385();
 	case 390:
 		error("Scene group 3 not implemented");
 	case 410:
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 2923c92d79..6512882218 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -2818,6 +2818,332 @@ void Scene350::checkGun() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 385 - City Hall
+ *
+ *--------------------------------------------------------------------------*/
+
+void Scene385::Action1::signal() {
+	Scene385 *scene = (Scene385 *)BF_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		BF_GLOBALS._player.disableControl();
+
+		switch (scene->_talkAction) {
+		case 0:
+			error("Bugs::talkscript385");
+			break;
+		case 3850:
+		case 3851:
+		case 3852:
+		case 3853:
+		case 3854:
+		case 3855:
+		case 3856:
+		case 3857:
+		case 3863:
+		case 3866: {
+			ADD_PLAYER_MOVER(187, 144);
+			break;
+		}
+		default: {
+			ADD_PLAYER_MOVER(231, 158);
+			break;
+		}
+		}
+		break;
+	case 1:
+		BF_GLOBALS._player.changeAngle(45);
+		setDelay(3);
+		break;
+	case 2:
+		scene->_stripManager.start(scene->_talkAction, this);
+		break;
+	case 3:
+		if (scene->_talkAction)
+			scene->_dezi.animate(ANIM_MODE_5, NULL);
+		BF_GLOBALS._player.enableControl();
+		remove();
+		break;
+	}
+}
+
+void Scene385::Action2::signal() {
+	Scene385 *scene = (Scene385 *)BF_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		ADD_PLAYER_MOVER(231, 158);
+		break;
+	}
+	case 1:
+		BF_GLOBALS._player.updateAngle(BF_GLOBALS._player._position);
+		setDelay(3);
+		break;
+	case 2:
+		scene->_stripManager.start(3864, this);
+		break;
+	case 3:
+		scene->_jim.animate(ANIM_MODE_5, this);
+		break;
+	case 4:
+		scene->_jim.setStrip(4);
+		scene->_jim.animate(ANIM_MODE_5, this);
+		break;
+	case 5:
+		scene->_stripManager.start(3865, this);
+		break;
+	case 6:
+		BF_GLOBALS._player.enableControl();
+		remove();
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+bool Scene385::Door::startAction(CursorType action, Event &event) {
+	Scene385 *scene = (Scene385 *)BF_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		BF_GLOBALS._walkRegions.proc2(6);
+		BF_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3850;
+		scene->setAction(&scene->_sequenceManager, scene, 3850, &BF_GLOBALS._player, this, NULL);
+		return true;
+	default:
+		return NamedObject::startAction(action, event);
+	}
+}
+
+bool Scene385::Jim::startAction(CursorType action, Event &event) {
+	Scene385 *scene = (Scene385 *)BF_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_TALK:
+		if (scene->_jimFlag) {
+			scene->_talkAction = 3867;
+			scene->setAction(&scene->_action1);
+		} else {
+			switch (BF_GLOBALS._dayNumber) {
+			case 1:
+				scene->_talkAction = 3858;
+				break;
+			case 2:
+				scene->_talkAction = 3859;
+				break;
+			case 3:
+				scene->_talkAction = 3860;
+				break;
+			case 4:
+				scene->_talkAction = 3861;
+				break;
+			default:
+				BF_GLOBALS._deziTopic = 3;
+				scene->_talkAction = 3868;
+				break;
+			}
+			
+			scene->_jimFlag = 1;
+			scene->setAction(&scene->_action1);
+		}
+		return true;
+	case INV_PRINT_OUT:
+		if (!BF_GLOBALS.getFlag(fGotPointsForMCard)) {
+			BF_GLOBALS._uiElements.addScore(30);
+			BF_GLOBALS.getFlag(fGotPointsForMCard);
+
+			scene->setAction(&scene->_action2);
+			return true;
+		}
+		break;
+	default:
+		break;
+	}
+
+	return NamedObject::startAction(action, event);
+}
+
+bool Scene385::Dezi::startAction(CursorType action, Event &event) {
+	Scene385 *scene = (Scene385 *)BF_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_TALK:
+		if (BF_GLOBALS._deziTopic == 3) {
+			scene->_talkAction = 3857;
+		} else {
+			BF_GLOBALS._deziTopic = 3;
+
+			switch (BF_GLOBALS._dayNumber) {
+			case 1:
+				if (BF_GLOBALS._deziTopic++ == 0) {
+					scene->_talkAction = 3850;
+				} else {
+					BF_GLOBALS._deziTopic = 3;
+					scene->_talkAction = 3851;
+				}
+				break;
+			case 2:
+				if (BF_GLOBALS._deziTopic++ == 0) {
+					scene->_talkAction = 3852;
+				} else {
+					BF_GLOBALS._deziTopic = 3;
+					scene->_talkAction = 3853;
+				}
+				break;
+			case 3:
+				if (BF_GLOBALS._deziTopic++ == 0) {
+					scene->_talkAction = 3854;
+				} else {
+					BF_GLOBALS._deziTopic = 3;
+					scene->_talkAction = 3855;
+				}
+				break;
+			case 4:
+				BF_GLOBALS._deziTopic = 3;
+				scene->_talkAction = 3856;
+				break;
+			default:
+				BF_GLOBALS._deziTopic = 3;
+				scene->_talkAction = 3868;
+				break;				
+			}
+		}
+
+		scene->setAction(&scene->_action1);
+		return true;
+	case INV_PRINT_OUT:
+		scene->_talkAction = 3863;
+		scene->setAction(&scene->_action1);
+		return true;
+	default:
+		return NamedObject::startAction(action, event);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+bool Scene385::Exit::startAction(CursorType action, Event &event) {
+	ADD_PLAYER_MOVER(BF_GLOBALS._player._position.x - 100, BF_GLOBALS._player._position.y + 100);
+	return true;
+}
+
+/*--------------------------------------------------------------------------*/
+
+
+Scene385::Scene385(): SceneExt() {
+	_talkAction = _jimFlag = 0;
+}
+
+void Scene385::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	s.syncAsSint16LE(_talkAction);
+	s.syncAsSint16LE(_jimFlag);
+}
+
+void Scene385::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	if (BF_GLOBALS._dayNumber == 0)
+		BF_GLOBALS._dayNumber = 1;
+
+	_exit.setDetails(Rect(0, 162, 320, 167), 385, -1, -1, -1, 1, NULL);
+	BF_GLOBALS._sound1.fadeSound(119);
+
+	loadScene(385);
+	setZoomPercents(115, 90, 145, 100);
+
+	_stripManager.addSpeaker(&_gameTextSpeaker);
+	_stripManager.addSpeaker(&_jake385Speaker);
+	_stripManager.addSpeaker(&_jimSpeaker);
+	_stripManager.addSpeaker(&_deziSpeaker);
+
+	BF_GLOBALS._player.postInit();
+	BF_GLOBALS._player.setVisage(BF_GLOBALS.getFlag(onDuty) ? 361 : 368);
+	BF_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
+	BF_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	BF_GLOBALS._player.changeZoom(-1);
+	BF_GLOBALS._player.enableControl();
+
+	_item3.setDetails(1, 385, 5, -1, -1, 1);
+	_item2.setDetails(2, 385, 7, -1, -1, 1);
+	_item1.setDetails(3, 385, 6, -1, 6, 1);
+	_item5.setDetails(4, 385, 14, -1, -1, 1);
+	
+	_jim.postInit();
+	_jim.setVisage(385);
+	_jim.setStrip(3);
+	_jim.setPosition(Common::Point(304, 113));
+	_jim.setDetails(385, 1, -1, 2, 1, NULL);
+
+	_dezi.postInit();
+	_dezi.setVisage(385);
+	_dezi.setStrip(2);
+	_dezi.setPosition(Common::Point(235, 93));
+	_dezi.fixPriority(120);
+	_dezi.setDetails(385, 3, -1, 2, 1, NULL);
+
+	_door.postInit();
+	_door.setVisage(385);
+	_door.setPosition(Common::Point(107, 27));
+	_door.setDetails(385, 0, -1, -1, 1, NULL);
+
+	BF_GLOBALS._walkRegions.proc1(6);
+
+	if (BF_GLOBALS._sceneManager._previousScene == 390) {
+		BF_GLOBALS._player.setPosition(Common::Point(109, 119));
+	} else {
+		BF_GLOBALS._player.disableControl();
+		BF_GLOBALS._player.setPosition(Common::Point(15, 250));
+		_sceneMode = 3852;
+		setAction(&_sequenceManager, this, 3852, &BF_GLOBALS._player, NULL);
+	}
+
+	_item4.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 385, 4, -1, -1, 1, NULL);
+}
+
+void Scene385::signal() {
+	switch (_sceneMode) {
+	case 3850:
+		BF_GLOBALS._sceneManager.changeScene(390);
+		break;
+	case 3851:
+		BF_GLOBALS._sceneManager.changeScene(380);
+		break;
+	case 3852:
+		BF_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene385::process(Event &event) {
+	SceneExt::process(event);
+
+	if (BF_GLOBALS._player._enabled && !_eventHandler && (event.mousePos.y < (BF_INTERFACE_Y - 1))) {
+		// Check if the cursor is on an exit
+		if (_exit.contains(event.mousePos)) {
+			GfxSurface surface = _cursorVisage.getFrame(EXITFRAME_SW);
+			BF_GLOBALS._events.setCursor(surface);
+		} else {
+			// In case an exit cursor was being shown, restore the previously selected cursor
+			CursorType cursorId = BF_GLOBALS._events.getCursor();
+			BF_GLOBALS._events.setCursor(cursorId);
+		}
+	}
+}
+
+void Scene385::dispatch() {
+	SceneExt::dispatch();
+
+	if (!_action && (BF_GLOBALS._player._position.y > 162)) {
+		// Leaving by exit
+		BF_GLOBALS._player.disableControl();
+		_sceneMode = 3851;
+		setAction(&_sequenceManager, this, 3851, &BF_GLOBALS._player, NULL);
+	}
+}
+
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h
index b2b57c279b..a2bc4270af 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.h
+++ b/engines/tsage/blue_force/blueforce_scenes3.h
@@ -368,7 +368,7 @@ public:
 	Scene340();
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	void remove();
+	virtual void remove();
 	virtual void signal();
 	virtual void process(Event &event);
 	virtual void dispatch();
@@ -424,7 +424,7 @@ public:
 	Scene342();
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	void remove();
+	virtual void remove();
 	virtual void signal();
 	virtual void process(Event &event);
 	virtual void dispatch();
@@ -484,12 +484,65 @@ public:
 
 	Scene350();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	void remove();
+	virtual void remove();
 	virtual void signal();
 	virtual void process(Event &event);
 	virtual void checkGun();
 };
 
+class Scene385: public SceneExt {
+	/* Items */
+	class Exit: public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Objects */
+	class Door: public NamedObject {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Jim: public NamedObject {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Dezi: public NamedObject {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Actions */
+	class Action1: public Action {
+	public:
+		virtual void signal();
+	};
+	class Action2: public Action {
+	public:
+		virtual void signal();
+	};
+public:
+	SequenceManager _sequenceManager;
+	Action1 _action1;
+	Action2 _action2;
+	Door _door;
+	Jim _jim;
+	Dezi _dezi;
+	SpeakerGameText _gameTextSpeaker;
+	SpeakerJim _jimSpeaker;
+	SpeakerDezi _deziSpeaker;
+	SpeakerJake385 _jake385Speaker;
+	NamedHotspot _item1, _item2, _item3, _item4, _item5;
+	Exit _exit;
+	int _talkAction, _jimFlag;
+
+	Scene385();
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_speakers.cpp b/engines/tsage/blue_force/blueforce_speakers.cpp
index 65db250c9d..d0cc44d397 100644
--- a/engines/tsage/blue_force/blueforce_speakers.cpp
+++ b/engines/tsage/blue_force/blueforce_speakers.cpp
@@ -423,6 +423,135 @@ void SpeakerCarter::setText(const Common::String &msg) {
 	_object2.fixCountdown(8, _numFrames);
 }
 
+/*--------------------------------------------------------------------------*/
+
+SpeakerDriver::SpeakerDriver(): VisualSpeaker() {
+	_color1 = 43;
+	_color2 = 70;
+	_speakerName = "DRIVER";
+}
+
+void SpeakerDriver::setText(const Common::String &msg) {
+	_removeObject1 = _removeObject2 = true;
+
+	_object1.postInit();
+	_object1.setVisage(416);
+	_object1.setStrip2(8);
+	_object1.fixPriority(254);
+	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 263,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	_object2.postInit();
+	_object2.setVisage(416);
+	_object2.setStrip2(1);
+	_object2.fixPriority(-1);
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 263,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
+SpeakerShooter::SpeakerShooter(): VisualSpeaker() {
+	_color1 = 43;
+	_color2 = 70;
+	_speakerName = "SHOOTER";
+}
+
+void SpeakerShooter::setText(const Common::String &msg) {
+	_removeObject1 = _removeObject2 = true;
+
+	_object1.postInit();
+	_object1.setVisage(418);
+	_object1.setStrip2(7);
+	_object1.fixPriority(254);
+	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 268,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	_object2.postInit();
+	_object2.setVisage(418);
+	_object2.setStrip2(1);
+	_object2.fixPriority(-1);
+	_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 268,
+		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
+SpeakerJim::SpeakerJim(): VisualSpeaker() {
+	_color1 = 32;
+	_speakerName = "JIM";
+}
+
+void SpeakerJim::setText(const Common::String &msg) {
+	_removeObject1 = _removeObject2 = true;
+
+	_object1.postInit();
+	_object1.setVisage(385);
+	_object1.setStrip(7);
+	_object1.fixPriority(254);
+	_object1.setPosition(Common::Point(262, 166));
+
+	_object2.postInit();
+	_object2.setVisage(385);
+	_object2.setStrip2(6);
+	_object2.fixPriority(255);
+	_object2.setPosition(Common::Point(262, 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
+SpeakerDezi::SpeakerDezi(): VisualSpeaker() {
+	_color1 = 21;
+	_speakerName = "DEZI";
+}
+
+void SpeakerDezi::setText(const Common::String &msg) {
+	_removeObject2 = true;
+
+	_object2.postInit();
+	_object2.setVisage(385);
+	_object2.setStrip2(5);
+	_object2.fixPriority(255);
+	_object2.setPosition(Common::Point(252, 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
+/*--------------------------------------------------------------------------*/
+
+SpeakerJake385::SpeakerJake385(): VisualSpeaker() {
+	_color1 = 13;
+	_speakerName = "JAKE_385";
+}
+
+void SpeakerJake385::setText(const Common::String &msg) {
+	_removeObject1 = _removeObject2 = true;
+
+	_object1.postInit();
+	_object1.setVisage(1001);
+	_object1.setStrip2(BF_GLOBALS.getFlag(onDuty) ? 3 : 4);
+	_object1.fixPriority(254);
+	_object1.setPosition(Common::Point(42, 166));
+
+	_object2.postInit();
+	_object2.setVisage(1001);
+	_object2.fixPriority(255);
+	_object2.setPosition(Common::Point(42, 166));
+
+	VisualSpeaker::setText(msg);
+	_object2.fixCountdown(8, _numFrames);
+}
+
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h
index 37b8050ef0..dd902a0ebe 100644
--- a/engines/tsage/blue_force/blueforce_speakers.h
+++ b/engines/tsage/blue_force/blueforce_speakers.h
@@ -163,6 +163,46 @@ public:
 	virtual void setText(const Common::String &msg);
 };
 
+class SpeakerDriver: public VisualSpeaker {
+public:
+	SpeakerDriver();
+
+	virtual Common::String getClassName() { return "SpeakerDriver"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerShooter: public VisualSpeaker {
+public:
+	SpeakerShooter();
+
+	virtual Common::String getClassName() { return "SpeakerShooter"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerJim: public VisualSpeaker {
+public:
+	SpeakerJim();
+
+	virtual Common::String getClassName() { return "SpeakerJim"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerDezi: public VisualSpeaker {
+public:
+	SpeakerDezi();
+
+	virtual Common::String getClassName() { return "SpeakerDezi"; }
+	virtual void setText(const Common::String &msg);
+};
+
+class SpeakerJake385: public VisualSpeaker {
+public:
+	SpeakerJake385();
+
+	virtual Common::String getClassName() { return "SpeakerJake385"; }
+	virtual void setText(const Common::String &msg);
+};
+
 } // End of namespace BlueForce
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 0519c2da2b..22b874d6ae 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -191,6 +191,9 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_dayNumber);
 	s.syncAsSint16LE(_v4CEA4);
+	s.syncAsSint16LE(_v4CEB4);
+	s.syncAsSint16LE(_v4CEB6);
+	s.syncAsSint16LE(_deziTopic);
 	s.syncAsSint16LE(_deathReason);
 	s.syncAsSint16LE(_driveFromScene);
 	s.syncAsSint16LE(_driveToScene);
@@ -205,8 +208,6 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_mapLocationId);
 	s.syncAsSint16LE(_clip1Bullets);
 	s.syncAsSint16LE(_clip2Bullets);
-	s.syncAsSint16LE(_v4CEB4);
-	s.syncAsSint16LE(_v4CEB6);
 }
 
 void BlueForceGlobals::reset() {
@@ -228,6 +229,9 @@ void BlueForceGlobals::reset() {
 	_interfaceY = BF_INTERFACE_Y;
 	_dayNumber = 0;
 	_v4CEA4 = 0;
+	_v4CEB4 = 0;
+	_v4CEB6 = 0;
+	_deziTopic = 0;
 	_deathReason = 0;
 	_v501FC = 0;
 	_v50696 = 0;
@@ -237,8 +241,6 @@ void BlueForceGlobals::reset() {
 	_v51C44 = 1;
 	_clip1Bullets = 8;
 	_clip2Bullets = 8;
-	_v4CEB4 = 0;
-	_v4CEB6 = 0;
 }
 
 bool BlueForceGlobals::getHasBullets() {
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 7f82bba114..c573d334b8 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -171,6 +171,7 @@ public:
 	int _v4CEA4;
 	int _v4CEB4;
 	int _v4CEB6;
+	int _deziTopic;
 	int _deathReason;
 	int _driveFromScene;
 	int _driveToScene;