MADS: Phantom: Merge _variant and _initialVariant

7 files changed, 27 insertions, 30 deletions

diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp
index 614217524b..f3b599f246 100644
--- a/engines/mads/phantom/phantom_scenes1.cpp
+++ b/engines/mads/phantom/phantom_scenes1.cpp
@@ -849,14 +849,14 @@ void Scene103::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 
-	_scene->_initialVariant = 0;
+	_scene->_variant = 0;
 
 	if ((_globals[kPrompterStandStatus] == 1) || (_globals[kCurrentYear] == 1881)) {
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 		if ((_globals[kJacquesStatus] == 0) && (_globals[kCurrentYear] == 1881))
-			_scene->_initialVariant = 2;
+			_scene->_variant = 2;
 		else if ((_globals[kJacquesStatus] >= 1) && (_globals[kCurrentYear] == 1881))
-			_scene->_initialVariant = 3;
+			_scene->_variant = 3;
 	}
 
 	_scene->addActiveVocab(NOUN_PROMPTERS_STAND);
@@ -902,7 +902,7 @@ void Scene103::enter() {
 	_globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1));
 	_globals._spriteIndexes[2] = _scene->_sprites.addSprites("*RDR_6");
 
-	adjustRails(_scene->_initialVariant);
+	adjustRails(_scene->_variant);
 
 	_scene->_hotspots.activate(NOUN_JACQUES, false);
 	_scene->_hotspots.activate(NOUN_KEY, false);
@@ -2468,7 +2468,7 @@ void Scene104::setup() {
 	setAAName();
 
 	if (_globals[kTrapDoorStatus] == 1)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_MONSIEUR_RICHARD);
 }
@@ -3613,7 +3613,7 @@ void Scene105::synchronize(Common::Serializer &s) {
 
 void Scene105::setup() {
 	if (_globals[kCurrentYear] == 1993)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
@@ -4182,7 +4182,7 @@ void Scene106::synchronize(Common::Serializer &s) {
 
 void Scene106::setup() {
 	if (_globals[kCurrentYear] == 1881)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
@@ -5042,7 +5042,7 @@ void Scene108::setup() {
 	setAAName();
 
 	if (_globals[kCurrentYear] == 1993)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_GENTLEMAN);
 	_scene->addActiveVocab(NOUN_CHARLES);
@@ -6113,7 +6113,7 @@ void Scene110::synchronize(Common::Serializer &s) {
 
 void Scene110::setup() {
 	if (_globals[kCurrentYear] == 1993)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
@@ -6476,7 +6476,7 @@ void Scene111::synchronize(Common::Serializer &s) {
 
 void Scene111::setup() {
 	if (_globals[kCurrentYear] == 1993)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
@@ -9152,7 +9152,7 @@ void Scene114::synchronize(Common::Serializer &s) {
 
 void Scene114::setup() {
 	if (_globals[kCurrentYear] == 1993)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp
index 84cb4fa4e7..22a26ee9ca 100644
--- a/engines/mads/phantom/phantom_scenes2.cpp
+++ b/engines/mads/phantom/phantom_scenes2.cpp
@@ -618,7 +618,7 @@ void Scene202::setup() {
 	setAAName();
 
 	if (_globals[kTicketPeoplePresent] == 2)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_CHANDELIER);
 	_scene->addActiveVocab(NOUN_EDGAR_DEGAS);
@@ -1536,7 +1536,7 @@ void Scene203::synchronize(Common::Serializer &s) {
 
 void Scene203::setup() {
 	if (_globals[kCurrentYear] == 1993)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
@@ -3293,7 +3293,7 @@ void Scene204::synchronize(Common::Serializer &s) {
 
 void Scene204::setup() {
 	if ((_globals[kCurrentYear] == 1993) || _globals[kRightDoorIsOpen504])
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	setPlayerSpritesPrefix();
 	setAAName();
@@ -4240,12 +4240,12 @@ void Scene205::setup() {
 		return;
 
 	if (_globals[kJacquesStatus] == 1)
-		_scene->_initialVariant = 3;
+		_scene->_variant = 3;
 	else if (_globals[kJacquesStatus] == 0) {
 		if (_globals[kMadameGiryLocation] == 0)
-			_scene->_initialVariant = 2;
+			_scene->_variant = 2;
 		else if (_globals[kMadameGiryLocation] == 1)
-			_scene->_initialVariant = 1;
+			_scene->_variant = 1;
 	}
 }
 
diff --git a/engines/mads/phantom/phantom_scenes3.cpp b/engines/mads/phantom/phantom_scenes3.cpp
index 3c7bae58aa..77ef15579f 100644
--- a/engines/mads/phantom/phantom_scenes3.cpp
+++ b/engines/mads/phantom/phantom_scenes3.cpp
@@ -2232,7 +2232,7 @@ void Scene309::setup() {
 	setAAName();
 
 	if (_globals[kRightDoorIsOpen504])
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 }
 
 void Scene309::enter() {
diff --git a/engines/mads/phantom/phantom_scenes4.cpp b/engines/mads/phantom/phantom_scenes4.cpp
index c9472ea538..ece1f2b3c4 100644
--- a/engines/mads/phantom/phantom_scenes4.cpp
+++ b/engines/mads/phantom/phantom_scenes4.cpp
@@ -86,7 +86,7 @@ void Scene401::setup() {
 	setAAName();
 
 	if (_globals[kCatacombsMisc] & MAZE_EVENT_PUDDLE)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_RED_FRAME);
 	_scene->addActiveVocab(NOUN_YELLOW_FRAME);
@@ -580,10 +580,10 @@ void Scene403::setup() {
 	setAAName();
 
 	if (_globals[kCatacombsMisc] & MAZE_EVENT_HOLE)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	if (_globals[kCatacombsMisc] & MAZE_EVENT_PLANK)
-		_scene->_initialVariant = 2;
+		_scene->_variant = 2;
 
 	_scene->addActiveVocab(NOUN_RED_FRAME);
 	_scene->addActiveVocab(NOUN_YELLOW_FRAME);
@@ -1079,7 +1079,7 @@ void Scene404::setup() {
 	setAAName();
 
 	if (_globals[kCatacombsMisc] & MAZE_EVENT_BLOCK)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_RED_FRAME);
 	_scene->addActiveVocab(NOUN_YELLOW_FRAME);
@@ -2451,7 +2451,7 @@ void Scene408::setup() {
 	setAAName();
 
 	if ((_globals[kCatacombsMisc] & MAZE_EVENT_WEB) && (!_globals[kCobwebIsCut]))
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_RED_FRAME);
 	_scene->addActiveVocab(NOUN_YELLOW_FRAME);
@@ -4152,7 +4152,7 @@ void Scene453::setup() {
 	setAAName();
 
 	if (_globals[kCatacombsMisc] & MAZE_EVENT_STONE)
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_RED_FRAME);
 	_scene->addActiveVocab(NOUN_YELLOW_FRAME);
diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp
index dcc0a2eb0c..c25dd187e6 100644
--- a/engines/mads/phantom/phantom_scenes5.cpp
+++ b/engines/mads/phantom/phantom_scenes5.cpp
@@ -3170,7 +3170,7 @@ void Scene505::setup() {
 	setAAName();
 
 	if ((_globals[kCoffinStatus] == 2) && (!_globals[kChrisLeft505]))
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 
 	_scene->addActiveVocab(NOUN_CHRISTINE);
 }
@@ -3928,7 +3928,7 @@ void Scene506::setup() {
 	_scene->addActiveVocab(VERB_LOOK_AT);
 
 	if (!_globals[kChristineIsInBoat])
-		_scene->_initialVariant = 1;
+		_scene->_variant = 1;
 }
 
 void Scene506::enter() {
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 01cea1166d..335f772bbb 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -61,7 +61,6 @@ Scene::Scene(MADSEngine *vm)
 	_interfaceY = 0;
 	_spritesCount = 0;
 	_variant = 0;
-	_initialVariant = 0;
 
 	_speechReady = -1;
 
@@ -756,7 +755,6 @@ void Scene::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_roomChanged);
 	s.syncAsUint16LE(_nextSceneId);
 	s.syncAsUint16LE(_priorSceneId);
-	s.syncAsSint16LE(_initialVariant);
 	s.syncAsSint16LE(_variant);
 	_dynamicHotspots.synchronize(s);
 }
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index e1eee9154a..79e0fd4029 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -98,7 +98,6 @@ public:
 	int _textSpacing;
 	Hotspots _hotspots;
 	DirtyAreas _dirtyAreas;
-	int _initialVariant;
 	int _variant;
 	SceneInfo *_sceneInfo;
 	MSurface _backgroundSurface;