diff options
Diffstat (limited to 'engines/mads/phantom/phantom_scenes5.cpp')
| -rw-r--r-- | engines/mads/phantom/phantom_scenes5.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp index 2daaed9a90..d738504b82 100644 --- a/engines/mads/phantom/phantom_scenes5.cpp +++ b/engines/mads/phantom/phantom_scenes5.cpp @@ -92,7 +92,7 @@ void Scene501::enter() { _skipFl = false; } - _vm->_gameConv->get(26); + _vm->_gameConv->load(26); _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); @@ -257,7 +257,7 @@ void Scene501::step() { } void Scene501::actions() { - if (_vm->_gameConv->_running == 26) { + if (_vm->_gameConv->activeConvId() == 26) { _action._inProgress = false; return; } @@ -620,7 +620,7 @@ void Scene501::preActions() { break; case 1: - if (_vm->_gameConv->_running >= 0) + if (_vm->_gameConv->activeConvId() >= 0) _scene->_sequences.addTimer(6, 1); else { _game._player._stepEnabled = true; @@ -1853,12 +1853,12 @@ void Scene504::enter() { _scene->_hotspots.activate(NOUN_CHRISTINE, false); if (!_globals[kRightDoorIsOpen504]) { - _vm->_gameConv->get(19); - _vm->_gameConv->get(27); + _vm->_gameConv->load(19); + _vm->_gameConv->load(27); } else - _vm->_gameConv->get(21); + _vm->_gameConv->load(21); - _vm->_gameConv->get(26); + _vm->_gameConv->load(26); _globals._spriteIndexes[14] = _scene->_sprites.addSprites("*RDR_9"); _globals._spriteIndexes[15] = _scene->_sprites.addSprites(formAnimName('x', 8)); @@ -2263,7 +2263,7 @@ void Scene504::step() { } void Scene504::actions() { - if (_vm->_gameConv->_running == 26) { + if (_vm->_gameConv->activeConvId() == 26) { _action._inProgress = false; return; } @@ -2304,19 +2304,19 @@ void Scene504::actions() { return; } - if (_vm->_gameConv->_running == 19) { + if (_vm->_gameConv->activeConvId() == 19) { handleListenConversation(); _action._inProgress = false; return; } - if (_vm->_gameConv->_running == 27) { + if (_vm->_gameConv->activeConvId() == 27) { handlePlayConversation(); _action._inProgress = false; return; } - if (_vm->_gameConv->_running == 21) { + if (_vm->_gameConv->activeConvId() == 21) { handleFightConversation(); _action._inProgress = false; return; @@ -2360,7 +2360,7 @@ void Scene504::actions() { if (_action.isAction(VERB_WALK_THROUGH, NOUN_RIGHT_DOOR) || _action.isAction(VERB_OPEN, NOUN_RIGHT_DOOR)) { if (_globals[kRightDoorIsOpen504]) { - if (_vm->_gameConv->_running == 26) + if (_vm->_gameConv->activeConvId() == 26) _vm->_gameConv->abortConv(); _scene->_nextSceneId = 505; @@ -2580,7 +2580,7 @@ void Scene504::preActions() { break; case 1: - if (_vm->_gameConv->_running >= 0) + if (_vm->_gameConv->activeConvId() >= 0) _scene->_sequences.addTimer(6, 1); else { _game._player._stepEnabled = true; @@ -3186,7 +3186,7 @@ void Scene505::enter() { _checkFrame106 = false; } - _vm->_gameConv->get(20); + _vm->_gameConv->load(20); _scene->_hotspots.activateAtPos(NOUN_LID, false, Common::Point(216, 44)); _scene->_hotspots.activate(NOUN_CHRISTINE, false); @@ -3314,7 +3314,7 @@ void Scene505::actions() { return; } - if (_vm->_gameConv->_running == 20) { + if (_vm->_gameConv->activeConvId() == 20) { handleCoffinDialog(); _action._inProgress = false; return; @@ -3939,7 +3939,7 @@ void Scene506::enter() { _ascendingFl = false; } - _vm->_gameConv->get(26); + _vm->_gameConv->load(26); _globals._spriteIndexes[0] = _scene->_sprites.addSprites(formAnimName('x', 0)); _globals._spriteIndexes[1] = _scene->_sprites.addSprites(formAnimName('x', 1)); @@ -4077,7 +4077,7 @@ void Scene506::step() { _scene->_nextSceneId = 501; } - if (_ascendingFl && (_vm->_gameConv->_running != 26)) { + if (_ascendingFl && (_vm->_gameConv->activeConvId() != 26)) { _ascendingFl = false; _game._player._stepEnabled = false; } @@ -4205,7 +4205,7 @@ void Scene506::actions() { return; } - if (_vm->_gameConv->_running == 26) { + if (_vm->_gameConv->activeConvId() == 26) { _action._inProgress = false; return; } |
