MADS: Implement bulk of remaining conversation setup and support methods

3 files changed, 35 insertions, 35 deletions

diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp
index af22fd3056..be800cf3b3 100644
--- a/engines/mads/phantom/phantom_scenes1.cpp
+++ b/engines/mads/phantom/phantom_scenes1.cpp
@@ -67,7 +67,7 @@ void Scene1xx::sceneEntrySound() {
 			break;
 
 		case 104:
-			if ((_vm->_gameConv->_restoreRunning == 7) || (_scene->_priorSceneId == 301)) {
+			if ((_vm->_gameConv->restoreRunning() == 7) || (_scene->_priorSceneId == 301)) {
 				_vm->_sound->command(33);
 			} else if (!_globals[kRoom103104Transition] && !_globals[kObservedPhan104]) {
 				_vm->_sound->command(37);
@@ -218,7 +218,7 @@ void Scene101::enter() {
 		_talkCounter = 0;
 		_chandelierStatus = 3;
 
-		if (_vm->_gameConv->_restoreRunning == 1) {
+		if (_vm->_gameConv->restoreRunning() == 1) {
 			_vm->_gameConv->run(1);
 			_vm->_gameConv->exportPointer(&_globals[kPlayerScore]);
 			_chandelierStatus = 4;
@@ -1118,7 +1118,7 @@ void Scene103::enter() {
 			_anim3ActvFl = true;
 			_game._player._stepEnabled = true;
 			_scene->setAnimFrame(_globals._animationIndexes[3], 36);
-		} else if (_vm->_gameConv->_restoreRunning == 12) {
+		} else if (_vm->_gameConv->restoreRunning() == 12) {
 			_vm->_gameConv->run(12);
 			_vm->_gameConv->exportPointer(&_globals[kPlayerScore]);
 			_vm->_gameConv->exportValue(_globals[kMusicSelected]);
@@ -2504,7 +2504,7 @@ void Scene104::enter() {
 	}
 
 	if (_scene->_priorSceneId == RETURNING_FROM_LOADING) {
-		if (_vm->_gameConv->_restoreRunning == 7) {
+		if (_vm->_gameConv->restoreRunning() == 7) {
 			_globals._animationIndexes[1] = _scene->loadAnimation(formAnimName('r', 1), 1);
 			_globals._animationIndexes[2] = _scene->loadAnimation(formAnimName('d', 1), 1);
 			_walkStatus = 0;
@@ -7056,7 +7056,7 @@ void Scene112::enter() {
 	_scene->setAnimFrame(_globals._animationIndexes[1], 82);
 	_raoulAction = 2;
 
-	if (_vm->_gameConv->_restoreRunning == 3) {
+	if (_vm->_gameConv->restoreRunning() == 3) {
 		_vm->_gameConv->run(3);
 		_vm->_gameConv->exportPointer(&_globals[kPlayerScore]);
 		_scene->setAnimFrame(_globals._animationIndexes[1], 17);
@@ -7983,7 +7983,7 @@ void Scene113::enter() {
 		_game._player._facing = FACING_NORTH;
 	}
 
-	switch (_vm->_gameConv->_restoreRunning) {
+	switch (_vm->_gameConv->restoreRunning()) {
 	case 4:
 		_vm->_gameConv->run(4);
 		_vm->_gameConv->exportPointer(&_globals[kPlayerScore]);
diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp
index a1c73f2c5d..8789553962 100644
--- a/engines/mads/phantom/phantom_scenes2.cpp
+++ b/engines/mads/phantom/phantom_scenes2.cpp
@@ -128,7 +128,7 @@ void Scene201::enter() {
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[0], 14);
 	}
 
-	if (_vm->_gameConv->_restoreRunning == 16) {
+	if (_vm->_gameConv->restoreRunning() == 16) {
 		_game._player._playerPos = Common::Point(72, 101);
 		_game._player._facing = FACING_NORTHWEST;
 		_globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('r', 1), 0);
@@ -674,7 +674,7 @@ void Scene202::enter() {
 		_degasStatus = 4;
 	}
 
-	if (_vm->_gameConv->_restoreRunning == 17) {
+	if (_vm->_gameConv->restoreRunning() == 17) {
 		_vm->_gameConv->run(17);
 		_vm->_gameConv->exportValue(_game._objects.isInInventory(OBJ_TICKET));
 		_vm->_gameConv->exportValue(0);
@@ -683,7 +683,7 @@ void Scene202::enter() {
 		_globals[kWalkerConverse] = _vm->getRandomNumber(1, 4);
 	}
 
-	if (_vm->_gameConv->_restoreRunning == 9) {
+	if (_vm->_gameConv->restoreRunning() == 9) {
 		_vm->_gameConv->run(9);
 		_vm->_gameConv->exportPointer(&_globals[kPlayerScore]);
 		_game._player._playerPos = Common::Point(400, 141);
@@ -1588,7 +1588,7 @@ void Scene203::enter() {
 			_scene->_hotspots.activate(NOUN_MANAGERS_CHAIR, true);
 		}
 
-		if ((_scene->_priorSceneId == RETURNING_FROM_LOADING) && (_vm->_gameConv->_restoreRunning == 5)) {
+		if ((_scene->_priorSceneId == RETURNING_FROM_LOADING) && (_vm->_gameConv->restoreRunning() == 5)) {
 			_brieStatus = 4;
 			_raoulStatus = 0;
 			_anim1ActvFl = true;
@@ -1625,7 +1625,7 @@ void Scene203::enter() {
 			_scene->_hotspots.activate(NOUN_MANAGERS_CHAIR, true);
 		}
 
-		if ((_scene->_priorSceneId == RETURNING_FROM_LOADING) && (_vm->_gameConv->_restoreRunning == 8)) {
+		if ((_scene->_priorSceneId == RETURNING_FROM_LOADING) && (_vm->_gameConv->restoreRunning() == 8)) {
 			_globals._animationIndexes[1] = _scene->loadAnimation(formAnimName('c', 1), 0);
 			_scene->setAnimFrame(_globals._animationIndexes[1], 9);
 			_anim1ActvFl = true;
@@ -1652,7 +1652,7 @@ void Scene203::enter() {
 		_scene->_hotspots.activate(NOUN_DESK_LAMP, false);
 	}
 
-	if (_vm->_gameConv->_restoreRunning == 15) {
+	if (_vm->_gameConv->restoreRunning() == 15) {
 		_globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], false, -1);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 14);
 		_game._player._playerPos = Common::Point(98, 137);
@@ -4321,7 +4321,7 @@ void Scene205::enter() {
 		}
 
 		if (_scene->_priorSceneId == RETURNING_FROM_LOADING) {
-			if (_vm->_gameConv->_restoreRunning == 10) {
+			if (_vm->_gameConv->restoreRunning() == 10) {
 				int count = 0;
 
 				if (_game._objects.isInInventory(OBJ_RED_FRAME))
@@ -4349,7 +4349,7 @@ void Scene205::enter() {
 					_scene->setAnimFrame(_globals._animationIndexes[1], 66);
 				else
 					_giryStatus = 2;
-			} else if (_vm->_gameConv->_restoreRunning == 11) {
+			} else if (_vm->_gameConv->restoreRunning() == 11) {
 				_vm->_gameConv->run(11);
 				_vm->_gameConv->exportValue(_game._objects.isInInventory(OBJ_TICKET));
 				_vm->_gameConv->exportValue(0);
@@ -4372,7 +4372,7 @@ void Scene205::enter() {
 			_richardStatus = 3;
 			_scene->_hotspots.activate(NOUN_MONSIEUR_RICHARD, true);
 
-			if (_vm->_gameConv->_restoreRunning == 18) {
+			if (_vm->_gameConv->restoreRunning() == 18) {
 				_globals[kWalkerConverse] = _vm->getRandomNumber(1, 4);
 				_richardStatus = 3;
 				_vm->_gameConv->run(18);
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;