From 03fe7c6b86a0191845398284beb5d2daa3fc2eaa Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 15 Nov 2015 18:18:29 +0100
Subject: MADS: Phantom: Merge _variant and _initialVariant

---
 engines/mads/phantom/phantom_scenes2.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/mads/phantom/phantom_scenes2.cpp')

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;
 	}
 }
 
-- 
cgit v1.2.3