TSAGE: Cleanup and bugfixes for Blue Force scene 410 - Traffic Stop

2 files changed, 129 insertions, 122 deletions

diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp
index 07445a7e76..4acb962d67 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes4.cpp
@@ -66,7 +66,7 @@ void Scene410::Action2::signal() {
 	Scene410 *scene = (Scene410 *)BF_GLOBALS._sceneManager._scene;
 	BF_GLOBALS._player.disableControl();
 
-	switch (scene->_field1FB8++) {
+	switch (scene->_talkCount++) {
 	case 0:
 		scene->_sceneMode = 4105;
 		scene->_stripManager.start(BF_GLOBALS.getFlag(fTalkedShooterNoBkup) ? 4123 : 4107, scene);
@@ -103,7 +103,7 @@ void Scene410::Action3::signal() {
 	if (BF_GLOBALS.getFlag(fTalkedShooterNoBkup)) {
 		BF_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2;
-		scene->setAction(&scene->_sequenceManager1, scene, 4102, &scene->_object2, &BF_GLOBALS._player, NULL);
+		scene->setAction(&scene->_sequenceManager1, scene, 4102, &scene->_passenger, &BF_GLOBALS._player, NULL);
 	} else {
 		BF_GLOBALS.setFlag(fTalkedShooterNoBkup);
 		scene->_sceneMode = 0;
@@ -123,7 +123,7 @@ void Scene410::Action4::signal() {
 		}
 		break;
 	case 1:
-		BF_GLOBALS._player.updateAngle(scene->_object2._position);
+		BF_GLOBALS._player.updateAngle(scene->_passenger._position);
 		setDelay(3);
 		break;
 	case 2:
@@ -153,7 +153,7 @@ void Scene410::Action5::signal() {
 		}
 		break;
 	case 1:
-		BF_GLOBALS._player.updateAngle(scene->_object2._position);
+		BF_GLOBALS._player.updateAngle(scene->_passenger._position);
 		setDelay(3);
 		break;
 	case 2:
@@ -183,7 +183,7 @@ void Scene410::Action6::signal() {
 		}
 		break;
 	case 1:
-		BF_GLOBALS._player.updateAngle(scene->_object1._position);
+		BF_GLOBALS._player.updateAngle(scene->_driver._position);
 		setDelay(3);
 		break;
 	case 2:
@@ -222,8 +222,8 @@ void Scene410::Action7::signal() {
 	case 3:
 		BF_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
 		BF_GLOBALS._player.updateAngle(Common::Point(100, 170));
-		scene->setAction(&scene->_sequenceManager1, this, 4112, &scene->_object1, &scene->_object2,
-			&scene->_object3, NULL);
+		scene->setAction(&scene->_sequenceManager1, this, 4112, &scene->_driver, &scene->_passenger,
+			&scene->_harrison, NULL);
 		break;
 	case 5:
 		BF_GLOBALS._uiElements.addScore(30);
@@ -241,7 +241,7 @@ void Scene410::Action7::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-bool Scene410::Item2::startAction(CursorType action, Event &event) {
+bool Scene410::Motorcycle::startAction(CursorType action, Event &event) {
 	Scene410 *scene = (Scene410 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
@@ -249,7 +249,7 @@ bool Scene410::Item2::startAction(CursorType action, Event &event) {
 		if (!BF_GLOBALS.getFlag(fCalledBackup)) {
 			scene->_sceneMode = 4103;
 			scene->signal();
-		} else if (BF_GLOBALS.getFlag(fSearchedTruck) && !BF_GLOBALS._sceneObjects->contains(&scene->_object3)) {
+		} else if (BF_GLOBALS.getFlag(fSearchedTruck) && !BF_GLOBALS._sceneObjects->contains(&scene->_harrison)) {
 			scene->_sceneMode = 4103;
 			scene->signal();
 		} else if (scene->_field1FBC != 0) {
@@ -264,7 +264,7 @@ bool Scene410::Item2::startAction(CursorType action, Event &event) {
 	}
 }
 
-bool Scene410::Item4::startAction(CursorType action, Event &event) {
+bool Scene410::TruckFront::startAction(CursorType action, Event &event) {
 	Scene410 *scene = (Scene410 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
@@ -291,7 +291,7 @@ bool Scene410::Item4::startAction(CursorType action, Event &event) {
 
 /*--------------------------------------------------------------------------*/
 
-bool Scene410::Object1::startAction(CursorType action, Event &event) {
+bool Scene410::Driver::startAction(CursorType action, Event &event) {
 	Scene410 *scene = (Scene410 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
@@ -318,7 +318,7 @@ bool Scene410::Object1::startAction(CursorType action, Event &event) {
 		return true;
 	case INV_HANDCUFFS:
 		if (BF_GLOBALS.getFlag(fCalledBackup)) {
-			if ((scene->_field1FB8 < 5) || (scene->_field1FB6 < 1) || (scene->_field1FBC != 0))
+			if ((scene->_talkCount < 5) || (scene->_field1FB6 < 1) || (scene->_field1FBC != 0))
 				break;
 
 			BF_GLOBALS._player.disableControl();
@@ -340,7 +340,7 @@ bool Scene410::Object1::startAction(CursorType action, Event &event) {
 		} else if (!scene->_field1FC4) {
 			BF_GLOBALS._player.disableControl();
 			scene->_sceneMode = 2;
-			scene->setAction(&scene->_sequenceManager1, scene, 4120, &scene->_object2, &BF_GLOBALS._player, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 4120, &scene->_passenger, &BF_GLOBALS._player, NULL);
 		} else if ((scene->_field1FBC != 0) || (scene->_field1FC2 != 0)) {
 			break;
 		} else {
@@ -348,7 +348,7 @@ bool Scene410::Object1::startAction(CursorType action, Event &event) {
 			BF_GLOBALS._uiElements.addScore(30);
 			BF_GLOBALS._player.disableControl();
 			scene->_sceneMode = 4127;
-			scene->setAction(&scene->_sequenceManager1, scene, 4127, &scene->_object1, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 4127, &scene->_driver, NULL);
 		}
 		return true;
 	case INV_MIRANDA_CARD:
@@ -364,7 +364,7 @@ bool Scene410::Object1::startAction(CursorType action, Event &event) {
 			scene->_sceneMode = 0;
 
 			// TODO: Original code pushes a copy of the entirety of object1 onto stack
-			scene->setAction(&scene->_sequenceManager1, scene, 4126, &BF_GLOBALS._player, &scene->_object1, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 4126, &BF_GLOBALS._player, &scene->_driver, NULL);
 		}
 		return true;
 	default:
@@ -374,7 +374,7 @@ bool Scene410::Object1::startAction(CursorType action, Event &event) {
 	return NamedObject::startAction(action, event);
 }
 
-bool Scene410::Object2::startAction(CursorType action, Event &event) {
+bool Scene410::Passenger::startAction(CursorType action, Event &event) {
 	Scene410 *scene = (Scene410 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
@@ -401,12 +401,14 @@ bool Scene410::Object2::startAction(CursorType action, Event &event) {
 		return true;
 	case INV_HANDCUFFS:
 		if (BF_GLOBALS.getFlag(fCalledBackup)) {
-			if ((scene->_field1FB8 < 5) || (scene->_field1FBA != 0))
+			if ((scene->_talkCount < 5) || (scene->_field1FBA != 0))
 				break;
 
 			BF_GLOBALS._player.disableControl();
 			scene->_sceneMode = 9;
-			ADD_PLAYER_MOVER(195, 139);
+			Common::Point destPos(195, 139);
+			PlayerMover *mover = new PlayerMover();
+			BF_GLOBALS._player.addMover(mover, &destPos, scene);
 		} else if (BF_GLOBALS.getFlag(fTalkedShooterNoBkup)) {
 			scene->setAction(&scene->_action3);
 		} else {
@@ -426,7 +428,7 @@ bool Scene410::Object2::startAction(CursorType action, Event &event) {
 
 			scene->_sceneMode = 0;
 			scene->setAction(&scene->_sequenceManager1, scene, 4125, &BF_GLOBALS._player,
-				&scene->_object2, NULL);
+				&scene->_passenger, NULL);
 		}
 		return true;
 	default:
@@ -436,7 +438,7 @@ bool Scene410::Object2::startAction(CursorType action, Event &event) {
 	return NamedObject::startAction(action, event);
 }
 
-bool Scene410::Object3::startAction(CursorType action, Event &event) {
+bool Scene410::Harrison::startAction(CursorType action, Event &event) {
 	Scene410 *scene = (Scene410 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
@@ -445,7 +447,10 @@ bool Scene410::Object3::startAction(CursorType action, Event &event) {
 			if (BF_GLOBALS.getFlag(fSearchedTruck)) {
 				BF_GLOBALS._player.disableControl();
 				scene->_sceneMode = 8;
-				ADD_PLAYER_MOVER(147, 143);
+
+				Common::Point destPos(147, 143);
+				PlayerMover *mover = new PlayerMover();
+				BF_GLOBALS._player.addMover(mover, &destPos, scene);
 			} else {
 				SceneItem::display2(350, 13);
 			}
@@ -457,7 +462,7 @@ bool Scene410::Object3::startAction(CursorType action, Event &event) {
 			BF_GLOBALS.set2Flags(f1098Frankie);
 			BF_GLOBALS.clearFlag(f1098Marina);
 		} else if ((BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 1) ||
-				(!scene->_field1FBA && (scene->_field1FB8 < 5))) {
+				(!scene->_field1FBA && (scene->_talkCount < 5))) {
 			SceneItem::display2(350, 13);
 		} else if (!scene->_field1FBA) {
 			if (scene->_field1FBA)
@@ -493,14 +498,14 @@ bool Scene410::Object3::startAction(CursorType action, Event &event) {
 /*--------------------------------------------------------------------------*/
 
 Scene410::Scene410(): SceneExt() {
-	_field1FB6 = _field1FB8 = _field1FBA = _field1FBC = 0;
+	_field1FB6 = _talkCount = _field1FBA = _field1FBC = 0;
 	_field1FBE = _field1FC0 = _field1FC2 = _field1FC4 = 0;
 }
 
 void Scene410::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 	s.syncAsSint16LE(_field1FB6);
-	s.syncAsSint16LE(_field1FB8);
+	s.syncAsSint16LE(_talkCount);
 	s.syncAsSint16LE(_field1FBA);
 	s.syncAsSint16LE(_field1FBC);
 	s.syncAsSint16LE(_field1FBE);
@@ -524,6 +529,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_jakeUniformSpeaker);
 	_stripManager.addSpeaker(&_harrisonSpeaker);
 	_stripManager.addSpeaker(&_shooterSpeaker);
+	_stripManager.addSpeaker(&_driverSpeaker);
 
 	BF_GLOBALS._player.postInit();
 	BF_GLOBALS._player.setVisage(1341);
@@ -533,20 +539,20 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player.setPosition(Common::Point(114, 133));
 	BF_GLOBALS._player.changeZoom(-1);
 
-	_item2.setDetails(8, 410, 15, -1, -1, 1);
+	_motorcycle.setDetails(8, 410, 15, -1, -1, 1);
 
-	_object2.postInit();
-	_object2.setVisage(415);
-	_object2.setStrip(1);
-	_object2.setPosition(Common::Point(278, 92));
-	_object2.setDetails(410, 4, -1, 5, 1, NULL);
+	_passenger.postInit();
+	_passenger.setVisage(415);
+	_passenger.setStrip(1);
+	_passenger.setPosition(Common::Point(278, 92));
+	_passenger.setDetails(410, 4, -1, 5, 1, NULL);
 
-	_object1.postInit();
-	_object1.setVisage(416);
-	_object1.setStrip(2);
-	_object1.setPosition(Common::Point(244, 85));
-	_object1.setDetails(410, 6, -1, 7, 1, NULL);
-	_object1.changeZoom(-1);
+	_driver.postInit();
+	_driver.setVisage(416);
+	_driver.setStrip(2);
+	_driver.setPosition(Common::Point(244, 85));
+	_driver.setDetails(410, 6, -1, 7, 1, NULL);
+	_driver.changeZoom(-1);
 
 	_object5.postInit();
 	_object5.setVisage(410);
@@ -558,32 +564,32 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 	_object6.setStrip(4);
 	_object6.setPosition(Common::Point(240, 43));
 
-	_item4.setDetails(6, 410, 3, -1, -1, 1);
-	_item3.setDetails(7, 410, 3, -1, -1, 1);
+	_truckFront.setDetails(6, 410, 3, -1, -1, 1);
+	_truckBack.setDetails(7, 410, 3, -1, -1, 1);
 
 	switch (BF_GLOBALS._sceneManager._previousScene) {
 	case 415:
 		BF_GLOBALS.setFlag(fSearchedTruck);
 		BF_GLOBALS._player.setPosition(Common::Point(210, 90));
 
-		_object2.remove();
-		_object1.remove();
+		_passenger.remove();
+		_driver.remove();
 		BF_GLOBALS._walkRegions.proc1(21);
 		BF_GLOBALS._walkRegions.proc1(22);
 
-		_object3.postInit();
-		_object3.setVisage(343);
-		_object3.setObjectWrapper(new SceneObjectWrapper());
-		_object3.animate(ANIM_MODE_1, NULL);
-		_object3.setDetails(350, 12, 13, 14, 1, NULL);
-		_object3.setPosition(Common::Point(97, 185));
-		_object3.changeZoom(-1);
+		_harrison.postInit();
+		_harrison.setVisage(343);
+		_harrison.setObjectWrapper(new SceneObjectWrapper());
+		_harrison.animate(ANIM_MODE_1, NULL);
+		_harrison.setDetails(350, 12, 13, 14, 1, NULL);
+		_harrison.setPosition(Common::Point(97, 185));
+		_harrison.changeZoom(-1);
 
-		_object4.postInit();
-		_object4.setVisage(410);
-		_object4.setDetails(410, 8, 9, 10, 1, NULL);
-		_object4.fixPriority(148);
-		_object4.setPosition(Common::Point(39, 168));
+		_patrolCar.postInit();
+		_patrolCar.setVisage(410);
+		_patrolCar.setDetails(410, 8, 9, 10, 1, NULL);
+		_patrolCar.fixPriority(148);
+		_patrolCar.setPosition(Common::Point(39, 168));
 
 		_field1FC4 = 1;
 		_sceneMode = 0;
@@ -591,35 +597,35 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 		break;
 	case 60:
 		if (BF_GLOBALS.getFlag(fSearchedTruck)) {
-			_object2.remove();
-			_object1.remove();
+			_passenger.remove();
+			_driver.remove();
 			_sceneMode = 0;
 		} else {
 			_field1FC4 = BF_GLOBALS._v50CC8;
 			_field1FBA = BF_GLOBALS._v50CC2;
-			_field1FB8 = BF_GLOBALS._v50CC6;
+			_talkCount = BF_GLOBALS._v50CC6;
 			_field1FB6 = BF_GLOBALS._v50CC4;
 
-			_object2.setVisage(418);
-			_object2.setStrip(6);
-			_object2.setPosition(Common::Point(227, 137));
+			_passenger.setVisage(418);
+			_passenger.setStrip(6);
+			_passenger.setPosition(Common::Point(227, 137));
 
-			if (_field1FB8 > 0) {
-				_object2.setVisage(415);
-				_object2.setStrip(2);
-				_object2.setFrame(5);
+			if (_talkCount > 0) {
+				_passenger.setVisage(415);
+				_passenger.setStrip(2);
+				_passenger.setFrame(5);
 			}
 			if (_field1FBA) {
-				_object2.setVisage(415);
-				_object2.setStrip(6);
-				_object2.setFrame(8);
+				_passenger.setVisage(415);
+				_passenger.setStrip(6);
+				_passenger.setFrame(8);
 			}
 
 			BF_GLOBALS._walkRegions.proc1(16);
 			if (BF_GLOBALS.getFlag(fDriverOutOfTruck)) {
-				_object1.setVisage(417);
-				_object1.setStrip(1);
-				_object1.setPosition(Common::Point(152, 97));
+				_driver.setVisage(417);
+				_driver.setStrip(1);
+				_driver.setPosition(Common::Point(152, 97));
 
 				BF_GLOBALS._walkRegions.proc1(7);
 			}
@@ -628,25 +634,25 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 				BF_GLOBALS._walkRegions.proc1(21);
 				BF_GLOBALS._walkRegions.proc1(22);
 
-				_object3.postInit();
-				_object3.setVisage(343);
-				_object3.setObjectWrapper(new SceneObjectWrapper());
-				_object3.animate(ANIM_MODE_1, NULL);
-				_object3.setDetails(350, 12, 13, 14, 1, NULL);
-				BF_GLOBALS._sceneItems.addBefore(&_object1, &_object3);
+				_harrison.postInit();
+				_harrison.setVisage(343);
+				_harrison.setObjectWrapper(new SceneObjectWrapper());
+				_harrison.animate(ANIM_MODE_1, NULL);
+				_harrison.setDetails(350, 12, 13, 14, 1, NULL);
+				BF_GLOBALS._sceneItems.addBefore(&_driver, &_harrison);
 
-				_object3.setPosition(Common::Point(-10, 124));
-				_object3.changeZoom(-1);
+				_harrison.setPosition(Common::Point(-10, 124));
+				_harrison.changeZoom(-1);
 
-				_object4.postInit();
-				_object4.setVisage(410);
-				_object4.setDetails(410, 8, 9, 10, 1, NULL);
-				_object4.fixPriority(148);
+				_patrolCar.postInit();
+				_patrolCar.setVisage(410);
+				_patrolCar.setDetails(410, 8, 9, 10, 1, NULL);
+				_patrolCar.fixPriority(148);
 
 				if (_field1FC4) {
-					_object3.setPosition(Common::Point(108, 112));
-					_object4.fixPriority(148);
-					_object4.setPosition(Common::Point(39, 168));
+					_harrison.setPosition(Common::Point(108, 112));
+					_patrolCar.fixPriority(148);
+					_patrolCar.setPosition(Common::Point(39, 168));
 
 					_sceneMode = 0;
 				} else {
@@ -669,7 +675,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 
 	signal();
 
-	_item1.setDetails(Rect(0, 0, SCREEN_WIDTH, BF_INTERFACE_Y), 410, 0, 1, 2, 1, NULL);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, BF_INTERFACE_Y), 410, 0, 1, 2, 1, NULL);
 }
 
 void Scene410::signal() {
@@ -680,7 +686,7 @@ void Scene410::signal() {
 
 		BF_GLOBALS._v50CC8 = _field1FC4;
 		BF_GLOBALS._v50CC2 = _field1FBA;
-		BF_GLOBALS._v50CC6 = _field1FB8;
+		BF_GLOBALS._v50CC6 = _talkCount;
 		BF_GLOBALS._v50CC4 = _field1FB6;
 		BF_GLOBALS._sceneManager.changeScene(60);
 		break;
@@ -714,7 +720,7 @@ void Scene410::signal() {
 	case 8:
 		BF_GLOBALS._walkRegions.proc2(22);
 		BF_GLOBALS._player.changeAngle(225);
-		_object3.changeAngle(45);
+		_harrison.changeAngle(45);
 		_sceneMode = 4114;
 		_stripManager.start(4120, this);
 		break;
@@ -726,19 +732,19 @@ void Scene410::signal() {
 		BF_GLOBALS._uiElements.addScore(30);
 		break;
 	case 10:
-		BF_GLOBALS._player.updateAngle(_object3._position);
+		BF_GLOBALS._player.updateAngle(_harrison._position);
 		_sceneMode = 0;
 		break;
 	case 4100:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4100, &_object2, &_object5, NULL);
+		setAction(&_sequenceManager1, this, 4100, &_passenger, &_object5, NULL);
 		BF_GLOBALS._walkRegions.proc1(16);
 		break;
 	case 4101:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4100, &_object1, &_object6, NULL);
+		setAction(&_sequenceManager1, this, 4101, &_driver, &_object6, NULL);
 		BF_GLOBALS.setFlag(fDriverOutOfTruck);
 		BF_GLOBALS._walkRegions.proc1(7);
 		break;
@@ -751,21 +757,22 @@ void Scene410::signal() {
 		_field1FC4 = 1;
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4104, &_object4, &_object3, NULL);
+		setAction(&_sequenceManager1, this, 4104, &_patrolCar, &_harrison, NULL);
 		break;
 	case 4105:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4105, &_object2, NULL);
+		setAction(&_sequenceManager1, this, 4105, &_passenger, NULL);
+		break;
 	case 4106:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 4119;
-		setAction(&_sequenceManager1, this, 4106, &_object2, NULL);
+		setAction(&_sequenceManager1, this, 4106, &_passenger, NULL);
 		break;
 	case 4107:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 5;
-		setAction(&_sequenceManager1, this, 4107, &_object2, NULL);
+		setAction(&_sequenceManager1, this, 4107, &BF_GLOBALS._player, &_passenger, NULL);
 		break;
 	case 4108:
 		BF_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
@@ -774,7 +781,7 @@ void Scene410::signal() {
 		BF_GLOBALS._walkRegions.proc2(16);
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4108, &_object3, NULL);
+		setAction(&_sequenceManager1, this, 4108, &_harrison, NULL);
 		break;
 	case 4109:
 		if ((BF_GLOBALS._player._position.x > 116) && (BF_GLOBALS._player._position.x != 195) &&
@@ -785,12 +792,12 @@ void Scene410::signal() {
 		BF_GLOBALS._walkRegions.proc2(22);
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4109, &_object1, &_object3, NULL);
+		setAction(&_sequenceManager1, this, 4109, &_driver, &_harrison, NULL);
 		break;
 	case 4110:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4110, &_object3, &_object1, NULL);
+		setAction(&_sequenceManager1, this, 4110, &_harrison, &_driver, NULL);
 		break;
 	case 4112:
 		BF_GLOBALS.setFlag(fGangInCar);
@@ -798,21 +805,21 @@ void Scene410::signal() {
 		BF_GLOBALS._player.updateAngle(Common::Point(100, 170));
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 4108;
-		setAction(&_sequenceManager1, this, 4112, &_object1, &_object2, &_object3, NULL);
+		setAction(&_sequenceManager1, this, 4112, &_driver, &_passenger, &_harrison, NULL);
 		break;
 	case 4114:
 		BF_GLOBALS._walkRegions.proc2(22);
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 4116;
-		setAction(&_sequenceManager1, this, 4114, &_object3, &_object4, NULL);
+		setAction(&_sequenceManager1, this, 4114, &_harrison, &_patrolCar, NULL);
 		break;
 	case 4116:
 		BF_GLOBALS._walkRegions.proc2(21);
 		BF_GLOBALS._walkRegions.proc2(22);
-		_object3.remove();
+		_harrison.remove();
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4116, &_object4, NULL);
+		setAction(&_sequenceManager1, this, 4116, &_patrolCar, NULL);
 		break;
 	case 4118:
 		BF_GLOBALS._player.disableControl();
@@ -822,30 +829,30 @@ void Scene410::signal() {
 	case 4119:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 4107;
-		setAction(&_sequenceManager1, this, 4119, &_object2, NULL);
+		setAction(&_sequenceManager1, this, 4119, &BF_GLOBALS._player, &_passenger, NULL);
 		break;
 	case 4121:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 6;
-		setAction(&_sequenceManager1, this, 4121, &BF_GLOBALS._player, &_object2, NULL);
+		setAction(&_sequenceManager1, this, 4121, &BF_GLOBALS._player, &_passenger, NULL);
 		break;
 	case 4122:
 		BF_GLOBALS._walkRegions.proc2(22);
 		BF_INVENTORY.setObjectScene(INV_22_SNUB, 0);
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 0;
-		setAction(&_sequenceManager1, this, 4122, &_object2, &_object3, NULL);
+		setAction(&_sequenceManager1, this, 4122, &_passenger, &_harrison, NULL);
 		break;
 	case 4123:
 		BF_INVENTORY.setObjectScene(INV_TYRONE_ID, 0);
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 5;
-		setAction(&_sequenceManager1, this, 4123, &_object1, &BF_GLOBALS._player, NULL);
+		setAction(&_sequenceManager1, this, 4123, &_driver, &BF_GLOBALS._player, NULL);
 		break;
 	case 4124:
 		BF_GLOBALS._player.disableControl();
 		_sceneMode = 7;
-		setAction(&_sequenceManager1, this, 4124, &_object1, &BF_GLOBALS._player, NULL);
+		setAction(&_sequenceManager1, this, 4124, &_driver, &BF_GLOBALS._player, NULL);
 		break;
 	case 4127:
 		SceneItem::display2(410, 16);
@@ -867,14 +874,14 @@ void Scene410::process(Event &event) {
 				event.handled = true;
 				BF_GLOBALS._player.disableControl();
 				_sceneMode = 2;
-				setAction(&_sequenceManager1, this, 4102, &_object2, &BF_GLOBALS._player, NULL);
+				setAction(&_sequenceManager1, this, 4102, &_passenger, &BF_GLOBALS._player, NULL);
 			}
 		} else if (BF_GLOBALS.getFlag(fTalkedDriverNoBkup)) {
 			if (!_action) {
 				_sceneMode = 1;
 				BF_GLOBALS._player.disableControl();
 				_sceneMode = 2;
-				setAction(&_sequenceManager1, this, 4120, &_object2, &BF_GLOBALS._player, NULL);
+				setAction(&_sequenceManager1, this, 4120, &_passenger, &BF_GLOBALS._player, NULL);
 			}
 		}
 	}
@@ -886,7 +893,7 @@ void Scene410::process(Event &event) {
 void Scene410::dispatch() {
 	SceneExt::dispatch();
 	if ((_sceneMode == 4112) || (_sceneMode == 4101)) {
-		_object3.updateAngle(_object1._position);
+		_harrison.updateAngle(_driver._position);
 	}
 }
 
diff --git a/engines/tsage/blue_force/blueforce_scenes4.h b/engines/tsage/blue_force/blueforce_scenes4.h
index 5da61cfaa0..1b961b7ba8 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.h
+++ b/engines/tsage/blue_force/blueforce_scenes4.h
@@ -71,38 +71,38 @@ class Scene410: public SceneExt {
 	};
 
 	/* Objects */
-	class Object1: public NamedObject {
+	class Driver: public NamedObject {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Object2: public NamedObject {
+	class Passenger: public NamedObject {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Object3: public NamedObject {
+	class Harrison: public NamedObject {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
 	/* Items */
-	class Item2: public NamedHotspot {
+	class Motorcycle: public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Item4: public NamedHotspot {
+	class TruckFront: public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
 	SequenceManager _sequenceManager1, _sequenceManager2, _sequenceManager3;
-	Object1 _object1;
-	Object2 _object2;
-	Object3 _object3;
-	NamedObject _object4, _object5, _object6;
-	NamedHotspot _item1;
-	Item2 _item2;
-	NamedHotspot _item3;
-	Item4 _item4;
+	Driver _driver;
+	Passenger _passenger;
+	Harrison _harrison;
+	NamedObject _patrolCar, _object5, _object6;
+	NamedHotspot _background;
+	Motorcycle _motorcycle;
+	NamedHotspot _truckBack;
+	TruckFront _truckFront;
 	Action1 _action1;
 	Action2 _action2;
 	Action3 _action3;
@@ -116,7 +116,7 @@ public:
 	SpeakerDriver _driverSpeaker;
 	SpeakerShooter _shooterSpeaker;
 	ASoundExt _sound1;
-	int _field1FB6, _field1FB8, _field1FBA;
+	int _field1FB6, _talkCount, _field1FBA;
 	int _field1FBC, _field1FBE;
 	int _field1FC0, _field1FC2, _field1FC4;