From d866b246052006183195c1cb7f2a862ff613349a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 9 Jan 2016 09:56:09 +1100
Subject: MADS: Implement bulk of remaining conversation setup and support
 methods

---
 engines/mads/phantom/phantom_scenes5.cpp | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

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

diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp
index d738504b82..12d064becb 100644
--- a/engines/mads/phantom/phantom_scenes5.cpp
+++ b/engines/mads/phantom/phantom_scenes5.cpp
@@ -43,7 +43,7 @@ void Scene5xx::sceneEntrySound() {
 	if ((_globals[kCoffinStatus] == 2) && !_game._visitedScenes.exists(506) && (_globals[kFightStatus] == 0) && (_scene->_currentSceneId == 504))
 		_vm->_sound->command(33);
 	else if (_scene->_currentSceneId == 505)
-		_vm->_sound->command((_vm->_gameConv->_restoreRunning == 20) ? 39 : 16);
+		_vm->_sound->command((_vm->_gameConv->restoreRunning() == 20) ? 39 : 16);
 	else
 		_vm->_sound->command(16);
 }
@@ -403,7 +403,7 @@ void Scene501::actions() {
 					break;
 
 				case 68:
-					_vm->_gameConv->abortConv();
+					_vm->_gameConv->stop();
 					_scene->_nextSceneId = 506;
 					break;
 				}
@@ -1987,7 +1987,7 @@ void Scene504::enter() {
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14);
 		}
 
-		if (_vm->_gameConv->_restoreRunning == 19) {
+		if (_vm->_gameConv->restoreRunning() == 19) {
 			_scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100);
 			_globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14);
@@ -2002,7 +2002,7 @@ void Scene504::enter() {
 			_scene->setAnimFrame(_globals._animationIndexes[0], 8);
 			_vm->_gameConv->run(19);
 			_vm->_gameConv->exportValue(_game._difficulty);
-		} else if (_vm->_gameConv->_restoreRunning == 27) {
+		} else if (_vm->_gameConv->restoreRunning() == 27) {
 			_scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100);
 			_globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1);
 			_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14);
@@ -2054,7 +2054,7 @@ void Scene504::enter() {
 				_game._player._visible = false;
 				_anim3ActvFl = true;
 
-				if (_vm->_gameConv->_restoreRunning == 21) {
+				if (_vm->_gameConv->restoreRunning() == 21) {
 					_game._player._stepEnabled = false;
 					_vm->_gameConv->run(21);
 					_vm->_gameConv->exportValue(_game._objects.isInInventory(OBJ_MUSIC_SCORE));
@@ -2361,7 +2361,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->activeConvId() == 26)
-				_vm->_gameConv->abortConv();
+				_vm->_gameConv->stop();
 
 			_scene->_nextSceneId = 505;
 		} else
@@ -3043,43 +3043,43 @@ void Scene504::handleListenConversation() {
 void Scene504::handlePlayConversation() {
 	switch (_action._activeAction._verbId) {
 	case 2:
-		*_vm->_gameConv->_nextStartNode = 1;
-		_vm->_gameConv->abortConv();
+		_vm->_gameConv->setStartNode(1);
+		_vm->_gameConv->stop();
 		_playStatus = 1;
 		_songNum = 1;
 		break;
 
 	case 3:
-		*_vm->_gameConv->_nextStartNode = 1;
-		_vm->_gameConv->abortConv();
+		_vm->_gameConv->setStartNode(1);
+		_vm->_gameConv->stop();
 		_playStatus = 1;
 		_songNum = 2;
 		break;
 
 	case 4:
-		*_vm->_gameConv->_nextStartNode = 1;
-		_vm->_gameConv->abortConv();
+		_vm->_gameConv->setStartNode(1);
+		_vm->_gameConv->stop();
 		_playStatus = 1;
 		_songNum = 3;
 		break;
 
 	case 5:
-		*_vm->_gameConv->_nextStartNode = 1;
-		_vm->_gameConv->abortConv();
+		_vm->_gameConv->setStartNode(1);
+		_vm->_gameConv->stop();
 		_playStatus = 1;
 		_songNum = 4;
 		break;
 
 	case 6:
-		*_vm->_gameConv->_nextStartNode = 1;
-		_vm->_gameConv->abortConv();
+		_vm->_gameConv->setStartNode(1);
+		_vm->_gameConv->stop();
 		_playStatus = 1;
 		_songNum = 5;
 		break;
 
 	case 8:
-		*_vm->_gameConv->_nextStartNode = 1;
-		_vm->_gameConv->abortConv();
+		_vm->_gameConv->setStartNode(1);
+		_vm->_gameConv->stop();
 		_playStatus = 1;
 		break;
 
@@ -3201,7 +3201,7 @@ void Scene505::enter() {
 	_globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('a', 4));
 
 	if (_scene->_priorSceneId == RETURNING_FROM_LOADING) {
-		if (_vm->_gameConv->_restoreRunning == 20) {
+		if (_vm->_gameConv->restoreRunning() == 20) {
 			_scene->_hotspots.activate(NOUN_LID, false);
 			_scene->_hotspots.activateAtPos(NOUN_LID, true, Common::Point(216, 44));
 			_globals._sequenceIndexes[7] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[7], false, 12);
@@ -4193,7 +4193,7 @@ void Scene506::actions() {
 				break;
 
 			case 90:
-				_vm->_gameConv->abortConv();
+				_vm->_gameConv->stop();
 				_scene->_nextSceneId = 504;
 				break;
 
-- 
cgit v1.2.3