diff options
| author | Strangerke | 2015-11-15 18:18:29 +0100 |
|---|---|---|
| committer | Strangerke | 2015-11-15 18:18:29 +0100 |
| commit | 03fe7c6b86a0191845398284beb5d2daa3fc2eaa (patch) | |
| tree | 879ded5c4eece9a26f0a8e57846be3ffa89791b1 /engines/mads/phantom/phantom_scenes2.cpp | |
| parent | ed0e6d19f82a270d061f788f990fa465fe1d3474 (diff) | |
| download | scummvm-rg350-03fe7c6b86a0191845398284beb5d2daa3fc2eaa.tar.gz scummvm-rg350-03fe7c6b86a0191845398284beb5d2daa3fc2eaa.tar.bz2 scummvm-rg350-03fe7c6b86a0191845398284beb5d2daa3fc2eaa.zip | |
MADS: Phantom: Merge _variant and _initialVariant
Diffstat (limited to 'engines/mads/phantom/phantom_scenes2.cpp')
| -rw-r--r-- | engines/mads/phantom/phantom_scenes2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; } } |