TSAGE: Remove more useless global variables. Savegames compatibility preserved.

7 files changed, 5 insertions, 43 deletions

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 8bcf28e173..5674773177 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -841,7 +841,7 @@ void SceneExt::startStrip() {
 		scene->_savedCanWalk = BF_GLOBALS._player._canWalk;
 		BF_GLOBALS._player.disableControl();
 
-		if (!BF_GLOBALS._v50696 && T2_GLOBALS._uiElements._active)
+		if (T2_GLOBALS._uiElements._active)
 			T2_GLOBALS._uiElements.hide();
 	}
 }
@@ -855,7 +855,7 @@ void SceneExt::endStrip() {
 		BF_GLOBALS._player._uiEnabled = scene->_savedUiEnabled;
 		BF_GLOBALS._player._canWalk = scene->_savedCanWalk;
 
-		if (!BF_GLOBALS._v50696 && T2_GLOBALS._uiElements._active)
+		if (T2_GLOBALS._uiElements._active)
 			T2_GLOBALS._uiElements.show();
 	}
 }
@@ -890,7 +890,6 @@ void PalettedScene::remove() {
 
 		BF_GLOBALS._sceneObjects->draw();
 		BF_GLOBALS._scenePalette.loadPalette(2);
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager._hasPalette = true;
 	}
 
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index f0bf0e2519..fa877ea6c9 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -176,7 +176,6 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 		loadScene(101);
 	}
 	BF_GLOBALS._scenePalette.loadPalette(2);
-	BF_GLOBALS._v51C44 = 1;
 	BF_GLOBALS._interfaceY = SCREEN_HEIGHT;
 
 	g_globals->_player.postInit();
@@ -232,7 +231,6 @@ void Scene109::Action1::signal() {
 		scene->_text.setup(BF_19840515, this);
 		break;
 	case 3:
-		BF_GLOBALS._v51C44 = 1;
 		scene->loadScene(115);
 
 		scene->_protaginist2.show();
@@ -246,7 +244,6 @@ void Scene109::Action1::signal() {
 		scene->_beerSign.show();
 		scene->_beerSign.setAction(&scene->_action2);
 
-		BF_GLOBALS._v501FC = 170;
 		setDelay(60);
 		break;
 	case 4:
@@ -401,12 +398,10 @@ void Scene110::Action1::signal() {
 		scene->_object6.show();
 		scene->_object9.show();
 		scene->_object10.show();
-		BF_GLOBALS._v51C44 = 1;
 		scene->loadScene(110);
 		setDelay(10);
 		break;
 	case 2:
-		BF_GLOBALS._v51C44 = 1;
 		scene->_object1.animate(ANIM_MODE_5, this);
 		break;
 	case 3: {
@@ -1833,7 +1828,6 @@ void Scene125::Action2::signal() {
 		setDelay(20);
 		break;
 	case 2: {
-		BF_GLOBALS._v51C44 = 1;
 		Common::Point destPos(202, 94);
 		NpcMover *mover = new NpcMover();
 		BF_GLOBALS._player.addMover(mover, &destPos, this);
@@ -2310,7 +2304,6 @@ void Scene140::Action1::signal() {
 		setDelay(60);
 	// No break on purpose
 	case 13:
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(150);
 	default:
 		break;
@@ -2336,8 +2329,6 @@ void Scene140::postInit(SceneObjectList *OwnerList) {
 	_object1.changeZoom(100);
 	_object1.hide();
 
-	BF_GLOBALS._v5020C = 0;
-	BF_GLOBALS._v501FC = 90;
 	BF_GLOBALS._sound1.play(7);
 
 	_object2.setAction(&_action1);
@@ -2638,7 +2629,6 @@ void Scene160::Action2::signal() {
 		BF_GLOBALS._sound1.stop();
 // End of hack
 
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(200);
 		break;
 	default:
@@ -2786,7 +2776,6 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(121, 60, 125, 70);
 
 	if ((BF_GLOBALS._bookmark == bLyleStoppedBy) && (BF_GLOBALS._dayNumber == 1)) {
-		BF_GLOBALS._v501FC = 87;
 		_sceneMessage.setup(THE_NEXT_DAY);
 		_sceneMode = 6;
 		setAction(&_sceneMessage, this);
@@ -2795,7 +2784,6 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
 		BF_GLOBALS._mapLocationId = 4;
 	} else if (((BF_GLOBALS._bookmark == bDroppedOffLyle) && (BF_GLOBALS._dayNumber == 3)) ||
 			((BF_GLOBALS._bookmark == bDoneAtLyles) && (BF_GLOBALS._dayNumber == 4))) {
-		BF_GLOBALS._v501FC = 87;
 		_sceneMessage.setup(THE_NEXT_DAY);
 		_sceneMode = 6;
 		setAction(&_sceneMessage, this);
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index c992afe620..1b0ed2a145 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -1603,7 +1603,6 @@ void Scene271::signal() {
 		}
 		break;
 	case 12:
-		BF_GLOBALS._v51C44 = 0;
 		BF_GLOBALS._sound1.changeSound(67);
 		BF_GLOBALS._sceneManager.changeScene(280);
 		break;
@@ -1617,7 +1616,6 @@ void Scene271::signal() {
 		_field2E16 = 1;
 		break;
 	case 2704:
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sound1.fadeOut2(NULL);
 		BF_GLOBALS._sceneManager.changeScene(690);
 		break;
@@ -1649,7 +1647,6 @@ void Scene271::signal() {
 		addFader((const byte *)&black, 2, this);
 		break;
 	case 2712:
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sound1.fadeOut2(NULL);
 		BF_GLOBALS._sceneManager.changeScene(180);
 		break;
@@ -1657,7 +1654,6 @@ void Scene271::signal() {
 		BF_GLOBALS._player.enableControl();
 		break;
 	case 2714:
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(560);
 		break;
 	case 2715:
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index f343c9de96..55526f6df2 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -564,7 +564,6 @@ void Scene300::dispatch() {
 
 		if ((BF_GLOBALS._player._position.y < 59) && (BF_GLOBALS._player._position.x > 137) &&
 				(_sceneMode != 6308) && (_sceneMode != 7308)) {
-			// The original was setting a useless global variable (removed)
 			_sceneMode = 6308;
 			BF_GLOBALS._player.disableControl();
 			ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 20,
@@ -967,7 +966,6 @@ void Scene315::Action1::signal() {
 /*--------------------------------------------------------------------------*/
 
 Scene315::Scene315() {
-	BF_GLOBALS._v51C44 = 1;
 	_field1B6C = _field139C = 0;
 	if (BF_GLOBALS._dayNumber == 0)
 		BF_GLOBALS._dayNumber = 1;
@@ -4444,7 +4442,6 @@ void Scene360::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player.enableControl();
 
 	if ((BF_GLOBALS._sceneManager._previousScene == 355) || (BF_GLOBALS._sceneManager._previousScene != 370)) {
-		// The original was using there a useless variable (now removed)
 		BF_GLOBALS._player.setPosition(Common::Point(253, 135));
 		BF_GLOBALS._player.setStrip(2);
 
diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp
index 13334ece08..b20092492f 100644
--- a/engines/tsage/blue_force/blueforce_scenes6.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes6.cpp
@@ -79,7 +79,6 @@ void Scene600::Action1::signal() {
 		}
 
 		BF_GLOBALS._screenSurface.fillRect(BF_GLOBALS._screenSurface.getBounds(), 0);
-		BF_GLOBALS._v51C44 = 1;
 		scene->loadScene(999);
 		setDelay(5);
 		break;
@@ -88,7 +87,6 @@ void Scene600::Action1::signal() {
 		setDelay(5);
 		break;
 	case 7:
-		BF_GLOBALS._v51C44 = 0;
 		remove();
 		break;
 	default:
diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 9a20788b6a..867b6a9f6e 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -577,17 +577,15 @@ bool Scene810::Lyle::startAction(CursorType action, Event &event) {
 				if ((BF_GLOBALS.getFlag(shownLyleRapsheet)) || (BF_GLOBALS.getFlag(shownLyleCrate1))){
 					scene->_sceneMode = 8141;
 				} else {
-					// Doublecheck on shownLyleCrate1 removed: useless
 					scene->_sceneMode = 8144;
 				}
 			} else {
 				if ((BF_GLOBALS.getFlag(shownLyleRapsheet)) || (BF_GLOBALS.getFlag(shownLyleCrate1))) {
 					scene->_sceneMode = 8129;
-				} else { // if (BF_GLOBALS.getFlag(shownLyleCrate1)) {
+				} else {
 					scene->_sceneMode = 8132;
-				// doublecheck Present in the original, may hide a bug in the original
-				//} else
-				//	scene->_sceneMode = 8121;
+					// Double check on ShownLyleCrate1 present in the original, may hide a bug in the original
+					// The original was then setting _sceneMode 8121
 				}
 			}
 		}
@@ -1071,7 +1069,6 @@ void Scene810::postInit(SceneObjectList *OwnerList) {
 		setAction(&_sequenceManager1, this, 8107, &BF_GLOBALS._player, &_lyle, NULL);
 		break;
 	case 935:
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._scenePalette.loadPalette(2);
 		_lyle.remove();
 
@@ -1804,13 +1801,11 @@ void Scene830::signal() {
 		_sceneMode = 832;
 		BF_GLOBALS._scenePalette.clearListeners();
 		addFader((const byte *)&black, 5, this);
-		BF_GLOBALS._v51C44 = 0;
 		break;
 	case 12:
 		_sceneMode = 831;
 		BF_GLOBALS._scenePalette.clearListeners();
 		addFader((const byte *)&black, 5, this);
-		BF_GLOBALS._v51C44 = 0;
 		break;
 	case 13:
 		BF_GLOBALS._sceneManager.changeScene(850);
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index aa407282e2..cef9e8135c 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -1966,7 +1966,6 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 	loadScene(910);
 
 	BF_GLOBALS._sound1.changeSound(99);
-	BF_GLOBALS._v51C44 = 0;
 
 	_stripManager.addSpeaker(&_gameTextSpeaker);
 	_stripManager.addSpeaker(&_jakeJacketSpeaker);
@@ -2277,7 +2276,6 @@ void Scene910::signal() {
 		break;
 	case 10:
 		BF_GLOBALS._player.disableControl();
-		BF_GLOBALS._v51C44 = 0;
 		BF_GLOBALS._sceneManager.changeScene(935);
 		break;
 	case 11:
@@ -2316,7 +2314,6 @@ void Scene910::signal() {
 		setAction(&_sequenceManager1, this, 9121, &_stuart, NULL);
 		break;
 	case 14:
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(940);
 		break;
 	case 16:
@@ -2376,7 +2373,6 @@ void Scene910::signal() {
 		break;
 	case 19:
 		BF_GLOBALS._deathReason = 14;
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(666);
 		break;
 	case 20:
@@ -2392,7 +2388,6 @@ void Scene910::signal() {
 			BF_GLOBALS.clearFlag(fGotPointsForSearchingDA);
 		else
 			BF_GLOBALS.setFlag(fGotPointsForSearchingDA);
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(900);
 		break;
 	case 9102:
@@ -2486,7 +2481,6 @@ void Scene910::signal() {
 	// No break on purpose
 	case 9137:
 		BF_GLOBALS._deathReason = 16;
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(666);
 		break;
 	case 9119:
@@ -2626,7 +2620,6 @@ void Scene910::signal() {
 	// No break on purpose
 	case 9134:
 		BF_GLOBALS._deathReason = 17;
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(666);
 		break;
 	case 9130:
@@ -2639,12 +2632,10 @@ void Scene910::signal() {
 		BF_GLOBALS._player.enableControl();
 		BF_GLOBALS._v4CEE4 = 4;
 		BF_GLOBALS._deathReason = 13;
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(666);
 		break;
 	case 9135:
 		BF_GLOBALS._deathReason = 15;
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(666);
 		break;
 	case 9136:
@@ -2689,7 +2680,6 @@ void Scene910::signal() {
 		break;
 	case 9143:
 		if (BF_GLOBALS._nico910State == 0) {
-			BF_GLOBALS._v51C44 = 1;
 			BF_GLOBALS._sceneManager.changeScene(920);
 		} else {
 			SceneItem::display(910, 89, SET_WIDTH, 312,
@@ -2708,7 +2698,6 @@ void Scene910::signal() {
 		break;
 	case 9148:
 		BF_GLOBALS._deathReason = 23;
-		BF_GLOBALS._v51C44 = 1;
 		BF_GLOBALS._sceneManager.changeScene(666);
 		break;
 	case 9149: