1 files changed, 27 insertions, 27 deletions

diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 49c3013ad5..feaf789392 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -2868,9 +2868,9 @@ void Scene350::checkGun() {
 
 void Scene355::Doorway::synchronize(Serializer &s) {
 	NamedObject::synchronize(s);
-	s.syncAsSint16LE(_v1);
-	s.syncAsSint16LE(_v2);
-	s.syncAsSint16LE(_v3);
+	s.syncAsSint16LE(_mode1356Count);
+	s.syncAsSint16LE(_talkCount);
+	s.syncAsSint16LE(_onDuty);
 }
 
 bool Scene355::Doorway::startAction(CursorType action, Event &event) {
@@ -2890,9 +2890,9 @@ bool Scene355::Doorway::startAction(CursorType action, Event &event) {
 		return true;
 	case CURSOR_TALK:
 		if (BF_GLOBALS._dayNumber >= 5) {
-			switch (_v2) {
+			switch (_talkCount) {
 			case 0:
-				++_v2;
+				++_talkCount;
 				BF_GLOBALS._sound1.play(109);
 				BF_GLOBALS._player.disableControl();
 				scene->_sceneMode = 0;
@@ -2920,7 +2920,7 @@ bool Scene355::Doorway::startAction(CursorType action, Event &event) {
 		BF_GLOBALS._player.disableControl();
 		scene->_sceneMode = 3562;
 		scene->setAction(&scene->_sequenceManager, scene, 3562, &BF_GLOBALS._player, NULL);
-		_v3 = !_v3 ? 1 : 0;
+		_onDuty = !_onDuty;
 		return true;
 	default:
 		break;
@@ -3355,14 +3355,14 @@ bool Scene355::Item11::startAction(CursorType action, Event &event) {
 		return true;
 	case CURSOR_TALK:
 		if (BF_GLOBALS._dayNumber == 5) {
-			switch (scene->_doorway._v2) {
+			switch (scene->_doorway._talkCount) {
 			case 0:
 				BF_GLOBALS._player.disableControl();
 				scene->_sceneMode = 0;
 				BF_GLOBALS.setFlag(fTookTrailerAmmo);
 				scene->_stripManager.start(3575, scene);
 				scene->_lyle._flag = 1;
-				scene->_doorway._v2 = 1;
+				scene->_doorway._talkCount = 1;
 				break;
 			case 1:
 				BF_GLOBALS._player.disableControl();
@@ -3534,28 +3534,28 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
 	_doorway.setVisage(355);
 	_doorway.setPosition(Common::Point(193, 105));
 	_doorway.fixPriority(18);
-	_doorway._v1 = 0;
-	_doorway._v3 = 0;
+	_doorway._mode1356Count = 0;
+	_doorway._onDuty = false;
 	BF_GLOBALS._sceneItems.push_back(&_doorway);
 
 	switch (BF_GLOBALS._dayNumber) {
 	case 1:
 		if (!BF_GLOBALS.getFlag(onDuty))
-			_doorway._v3 = 1;
+			_doorway._onDuty = true;
 		else if (BF_INVENTORY.getObjectScene(INV_GREENS_GUN)  == 320)
-			_doorway._v3 = 1;
+			_doorway._onDuty = true;
 		break;
 	case 2:
 	case 3:
 	case 4:
-		_doorway._v3 = 1;
+		_doorway._onDuty = true;
 		break;
 	default:
 		break;
 	}
 
 	if (BF_GLOBALS._dayNumber == 5)
-		_doorway._v2 = BF_GLOBALS.getFlag(fTookTrailerAmmo) ? 1 : 0;
+		_doorway._talkCount = BF_GLOBALS.getFlag(fTookTrailerAmmo) ? 1 : 0;
 
 	_object8.postInit();
 	_object8.setVisage(355);
@@ -3614,8 +3614,8 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
 			_object11.animate(ANIM_MODE_2);
 
 			_doorway.setPosition(Common::Point(146, 107));
-			_doorway._v3 = 0;
-			_doorway._v2 = 2;
+			_doorway._onDuty = false;
+			_doorway._talkCount = 2;
 			_lyle._flag = 2;
 
 			_green.postInit();
@@ -3713,16 +3713,16 @@ void Scene355::signal() {
 		_stripManager.start(BF_GLOBALS.getFlag(fBackupIn350) ? 3559 : 3554, this);
 		break;
 	case 1356:
-		switch (_doorway._v1) {
+		switch (_doorway._mode1356Count) {
 		case 0:
-			++_doorway._v1;
+			++_doorway._mode1356Count;
 			_sceneMode = 9999;
 			_stripManager.start(3550, this);
 			break;
 		case 1:
 			_sceneMode = 9999;
 			_stripManager.start(3551, this);
-			++_doorway._v1;
+			++_doorway._mode1356Count;
 			break;
 		default:
 			break;
@@ -3787,7 +3787,7 @@ void Scene355::signal() {
 			T2_GLOBALS._uiElements.addScore(10);
 		}
 
-		SceneItem::display2(355, !_doorway._v3 ? 24 : 25);
+		SceneItem::display2(355, !_doorway._onDuty ? 24 : 25);
 		BF_GLOBALS._player.enableControl();
 		break;
 	case 4550:
@@ -3796,8 +3796,8 @@ void Scene355::signal() {
 		BF_GLOBALS._sound1.play(90);
 		BF_GLOBALS._player._regionBitList |= 0x10;
 
-		_doorway._v3 = 0;
-		_doorway._v2 = 2;
+		_doorway._onDuty = false;
+		_doorway._talkCount = 2;
 		_lyle._flag = 2;
 		BF_GLOBALS._player.enableControl();
 		break;
@@ -3867,13 +3867,13 @@ void Scene355::signal() {
 	case 9984:
 		if (BF_GLOBALS._dayNumber == 5) {
 			_sceneMode = 0;
-			switch (_doorway._v2) {
+			switch (_doorway._talkCount) {
 			case 0:
 				BF_GLOBALS._sound1.play(109);
 				BF_GLOBALS.setFlag(fTookTrailerAmmo);
 				_stripManager.start(3575, this);
 				_lyle._flag = 1;
-				++_doorway._v2;
+				++_doorway._talkCount;
 				break;
 			case 1:
 				_stripManager.start(3573, this);
@@ -3884,7 +3884,7 @@ void Scene355::signal() {
 				break;
 			}
 		} else if (BF_GLOBALS.getFlag(greenTaken) || (BF_GLOBALS._dayNumber > 1)) {
-			if (_doorway._v3) {
+			if (_doorway._onDuty) {
 				SceneItem::display2(355, 23);
 				_sceneMode = 0;
 				signal();
@@ -4009,14 +4009,14 @@ void Scene355::signal() {
 	}
 	case 9997:
 		_sceneMode = 9999;
-		_doorway._v1 = 2;
+		_doorway._mode1356Count = 2;
 		_stripManager.start(3562, this);
 		break;
 	case 9998:
 		error("Talkdoor state");
 		break;
 	case 9999:
-		if (_doorway._v1 != 2) {
+		if (_doorway._mode1356Count != 2) {
 			BF_GLOBALS._player.enableControl();
 			BF_GLOBALS._player._canWalk = false;
 		} else if (BF_GLOBALS.getFlag(gunDrawn)) {