MADS: Cleanup of existing converstations skeleton code

5 files changed, 39 insertions, 39 deletions

diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp
index 3ec3052ad5..af9769d529 100644
--- a/engines/mads/phantom/game_phantom.cpp
+++ b/engines/mads/phantom/game_phantom.cpp
@@ -744,7 +744,7 @@ void GamePhantom::stopWalker() {
 
 void GamePhantom::step() {
 	if (_player._visible  && !_globals[kStopWalkerDisabled]
-	 && (_player._stepEnabled || (_vm->_gameConv->_running >= 0))
+	 && (_player._stepEnabled || (_vm->_gameConv->activeConvId() >= 0))
 	 && !_player._moving && (_player._facing == _player._turnToFacing)
 	 && (_scene._frameStartTime >= (uint32)_globals[kWalkerTiming])) {
 		if (_player._stopWalkers.empty())
diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp
index c86d2852c7..bfd60daec7 100644
--- a/engines/mads/phantom/phantom_scenes1.cpp
+++ b/engines/mads/phantom/phantom_scenes1.cpp
@@ -300,9 +300,9 @@ void Scene101::preActions() {
 }
 
 void Scene101::actions() {
-	if (_vm->_gameConv->_running == 0)
+	if (_vm->_gameConv->activeConvId() == 0)
 		handleConversation0();
-	else if (_vm->_gameConv->_running == 1)
+	else if (_vm->_gameConv->activeConvId() == 1)
 		handleConversation1();
 	else if (_action._lookFlag) {
 		if (_globals[kCurrentYear] == 1993)
@@ -525,7 +525,7 @@ void Scene101::handleAnimation1() {
 		}
 
 		if (_startWalkingFl) {
-			if (_vm->_gameConv->_running == 1) {
+			if (_vm->_gameConv->activeConvId() == 1) {
 				if (_talkCounter > 13)
 					_chandelierStatus = 1;
 			} else
@@ -541,7 +541,7 @@ void Scene101::handleAnimation1() {
 		case 1:
 			_globals[kBrieTalkStatus] = 2;
 			resetFrame = 45;
-			if (_vm->_gameConv->_running == 1)
+			if (_vm->_gameConv->activeConvId() == 1)
 				_vm->_gameConv->stop();
 			_scene->_dynamicHotspots.remove(_brieAnimId);
 			_game._player._stepEnabled = false;
@@ -1376,7 +1376,7 @@ void Scene103::actions() {
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 12) {
+	if (_vm->_gameConv->activeConvId() == 12) {
 		process_conv_jacques();
 		_action._inProgress = false;
 		return;
@@ -2678,7 +2678,7 @@ void Scene104::preActions() {
 }
 
 void Scene104::actions() {
-	if (_vm->_gameConv->_running == 7) {
+	if (_vm->_gameConv->activeConvId() == 7) {
 		processConversations();
 		_action._inProgress = false;
 		return;
@@ -5076,7 +5076,7 @@ void Scene108::enter() {
 		_globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('c', 1), 1);
 		_anim0ActvFl = true;
 
-		if (_vm->_gameConv->_running == 2) {
+		if (_vm->_gameConv->activeConvId() == 2) {
 			_globals[kWalkerConverse] = _vm->getRandomNumber(1, 4);
 			_charAction = 0;
 			_vm->_gameConv->run(2);
@@ -5133,7 +5133,7 @@ void Scene108::step() {
 }
 
 void Scene108::actions() {
-	if (_vm->_gameConv->_running == 2) {
+	if (_vm->_gameConv->activeConvId() == 2) {
 		handleCharlesConversation();
 		_action._inProgress = false;
 		return;
@@ -6641,7 +6641,7 @@ void Scene111::step() {
 }
 
 void Scene111::actions() {
-	if (_vm->_gameConv->_running == 14) {
+	if (_vm->_gameConv->activeConvId() == 14) {
 		handleListenConversation();
 		_action._inProgress = false;
 		return;
@@ -7081,7 +7081,7 @@ void Scene112::step() {
 }
 
 void Scene112::actions() {
-	if (_vm->_gameConv->_running == 3) {
+	if (_vm->_gameConv->activeConvId() == 3) {
 		handleConversation();
 		_action._inProgress = false;
 		return;
@@ -8081,19 +8081,19 @@ void Scene113::step() {
 }
 
 void Scene113::actions() {
-	if (_vm->_gameConv->_running == 13) {
+	if (_vm->_gameConv->activeConvId() == 13) {
 		handleLoveConversation();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 4) {
+	if (_vm->_gameConv->activeConvId() == 4) {
 		handleFlorentConversation();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 6) {
+	if (_vm->_gameConv->activeConvId() == 6) {
 		handleDeadConversation();
 		_action._inProgress = false;
 		return;
diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp
index eff0bf8db9..02e2d7c117 100644
--- a/engines/mads/phantom/phantom_scenes2.cpp
+++ b/engines/mads/phantom/phantom_scenes2.cpp
@@ -156,14 +156,14 @@ void Scene201::step() {
 	if (_anim1ActvFl)
 		handleSellerAnimation();
 
-	if ((_needHoldFl) && (_vm->_gameConv->_running != 16)) {
+	if ((_needHoldFl) && (_vm->_gameConv->activeConvId() != 16)) {
 		_game._player._stepEnabled = false;
 		_needHoldFl = false;
 	}
 }
 
 void Scene201::actions() {
-	if (_vm->_gameConv->_running == 16) {
+	if (_vm->_gameConv->activeConvId() == 16) {
 		handleConversation();
 		_action._inProgress = false;
 		return;
@@ -786,13 +786,13 @@ void Scene202::step() {
 }
 
 void Scene202::actions() {
-	if (_vm->_gameConv->_running == 17) {
+	if (_vm->_gameConv->activeConvId() == 17) {
 		handleConversation1();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 9) {
+	if (_vm->_gameConv->activeConvId() == 9) {
 		handleConversation2();
 		_action._inProgress = false;
 		return;
@@ -1725,7 +1725,7 @@ void Scene203::step() {
 		_vm->_sound->command(25);
 		_globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], false, -1);
 		_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 14);
-		if (_vm->_gameConv->_running != 15)
+		if (_vm->_gameConv->activeConvId() != 15)
 			_game._player._stepEnabled = true;
 		break;
 
@@ -1735,19 +1735,19 @@ void Scene203::step() {
 }
 
 void Scene203::actions() {
-	if (_vm->_gameConv->_running == 5) {
+	if (_vm->_gameConv->activeConvId() == 5) {
 		handleBrieConversation();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 8) {
+	if (_vm->_gameConv->activeConvId() == 8) {
 		handleRichardConversation();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 15) {
+	if (_vm->_gameConv->activeConvId() == 15) {
 		handleRichardAndDaaeConversation();
 		_action._inProgress = false;
 		return;
@@ -3481,7 +3481,7 @@ void Scene204::step() {
 	if (_game._trigger == 85)
 		_scene->_nextSceneId = 250;
 
-	if ((_vm->_gameConv->_running != 22) && !_skip1Fl && _endGameFl) {
+	if ((_vm->_gameConv->activeConvId() != 22) && !_skip1Fl && _endGameFl) {
 		_game._player._stepEnabled = false;
 		_skip1Fl = true;
 	}
@@ -3500,7 +3500,7 @@ void Scene204::step() {
 }
 
 void Scene204::actions() {
-	if (_vm->_gameConv->_running == 22) {
+	if (_vm->_gameConv->activeConvId() == 22) {
 		handleConversation();
 
 		_action._inProgress = false;
@@ -4525,19 +4525,19 @@ void Scene205::step() {
 }
 
 void Scene205::actions() {
-	if (_vm->_gameConv->_running == 18) {
+	if (_vm->_gameConv->activeConvId() == 18) {
 		handleConversation18();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 10) {
+	if (_vm->_gameConv->activeConvId() == 10) {
 		handleConversation10();
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 11) {
+	if (_vm->_gameConv->activeConvId() == 11) {
 		handleConversation11();
 		_action._inProgress = false;
 		return;
diff --git a/engines/mads/phantom/phantom_scenes3.cpp b/engines/mads/phantom/phantom_scenes3.cpp
index bb9bcee80c..3527a794b4 100644
--- a/engines/mads/phantom/phantom_scenes3.cpp
+++ b/engines/mads/phantom/phantom_scenes3.cpp
@@ -1070,7 +1070,7 @@ void Scene304::step() {
 }
 
 void Scene304::actions() {
-	if (_vm->_gameConv->_running == 23) {
+	if (_vm->_gameConv->activeConvId() == 23) {
 		handleConversation23();
 		_action._inProgress = false;
 		return;
diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp
index 2daaed9a90..406637eac4 100644
--- a/engines/mads/phantom/phantom_scenes5.cpp
+++ b/engines/mads/phantom/phantom_scenes5.cpp
@@ -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;
@@ -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;
@@ -3314,7 +3314,7 @@ void Scene505::actions() {
 		return;
 	}
 
-	if (_vm->_gameConv->_running == 20) {
+	if (_vm->_gameConv->activeConvId() == 20) {
 		handleCoffinDialog();
 		_action._inProgress = false;
 		return;
@@ -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;
 	}