HOPKINS: Some more renaming in TalkManager and Globals

1 files changed, 76 insertions, 76 deletions

diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index ea0c728c49..1d12cf1d0f 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -513,26 +513,26 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			break;
 
 		case 7:
-			_vm->_talkManager.PARLER_PERSO("rueh1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("rueh1.pe2");
 			break;
 
 		case 8:
-			_vm->_talkManager.PARLER_PERSO("ruef1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("ruef1.pe2");
 			break;
 
 		case 10:
-			_vm->_talkManager.PARLER_PERSO("bqeflic1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("bqeflic1.pe2");
 			break;
 
 		case 11:
-			_vm->_talkManager.PARLER_PERSO("bqeflic2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("bqeflic2.pe2");
 			break;
 
 		case 12:
 			_vm->_fontManager.hideText(9);
 			_vm->_eventsManager.VBL();
 			_vm->_eventsManager.VBL();
-			_vm->_talkManager.PARLER_PERSO("bqetueur.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("bqetueur.pe2");
 			break;
 
 		case 13:
@@ -617,56 +617,56 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			break;
 
 		case 16:
-			_vm->_talkManager.PARLER_PERSO("ftoubib.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("ftoubib.pe2");
 			break;
 
 		case 17:
-			_vm->_talkManager.PARLER_PERSO("flic2b.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("flic2b.pe2");
 			break;
 
 		case 18:
-			_vm->_talkManager.PARLER_PERSO("fjour.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("fjour.pe2");
 			break;
 
 		case 20:
-			_vm->_talkManager.PARLER_PERSO("PUNK.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("PUNK.pe2");
 			break;
 
 		case 21:
-			_vm->_talkManager.PARLER_PERSO("MEDLEG.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("MEDLEG.pe2");
 			break;
 
 		case 22:
-			_vm->_talkManager.OBJET_VIVANT("CADAVRE1.pe2");
+			_vm->_talkManager.animateObject("CADAVRE1.pe2");
 			break;
 
 		case 23:
-			_vm->_talkManager.PARLER_PERSO2("CHERCHE1.pe2");
+			_vm->_talkManager.startStaticCharacterDialogue("CHERCHE1.pe2");
 			break;
 
 		case 25:
-			_vm->_talkManager.PARLER_PERSO("AGENT1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("AGENT1.pe2");
 			break;
 
 		case 26:
-			_vm->_talkManager.PARLER_PERSO("AGENT2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("AGENT2.pe2");
 			break;
 
 		case 27:
 			if (_vm->_globals._saveData->_data[svField94] != 1 || _vm->_globals._saveData->_data[svField95] != 1)
-				_vm->_talkManager.PARLER_PERSO("STANDAR.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("STANDAR.pe2");
 			else
-				_vm->_talkManager.PARLER_PERSO("STANDAR1.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("STANDAR1.pe2");
 			break;
 
 		case 29:
 			_vm->_globals._disableInventFl = true;
-			_vm->_talkManager.OBJET_VIVANT("TELEP.pe2");
+			_vm->_talkManager.animateObject("TELEP.pe2");
 			_vm->_globals._disableInventFl = false;
 			break;
 
 		case 32:
-			_vm->_talkManager.PARLER_PERSO("SAMAN.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("SAMAN.pe2");
 			break;
 
 		case 35:
@@ -678,22 +678,22 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					_vm->_eventsManager.VBL();
 				} while (_vm->_soundManager._soundFl);
 			}
-			_vm->_talkManager.PARLER_PERSO("PTLAB.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("PTLAB.pe2");
 			break;
 
 		case 36:
 			if (_vm->_globals._saveData->_data[svField270] == 2 && _vm->_globals._saveData->_data[svField94] == 1 && _vm->_globals._saveData->_data[svField95] == 1)
 				_vm->_globals._saveData->_data[svField270] = 3;
 			if (!_vm->_globals._saveData->_data[svField270])
-				_vm->_talkManager.PARLER_PERSO2("PATRON0.pe2");
+				_vm->_talkManager.startStaticCharacterDialogue("PATRON0.pe2");
 			if (_vm->_globals._saveData->_data[svField270] == 1)
-				_vm->_talkManager.PARLER_PERSO2("PATRON1.pe2");
+				_vm->_talkManager.startStaticCharacterDialogue("PATRON1.pe2");
 			if (_vm->_globals._saveData->_data[svField270] == 2)
-				_vm->_talkManager.PARLER_PERSO2("PATRON2.pe2");
+				_vm->_talkManager.startStaticCharacterDialogue("PATRON2.pe2");
 			if (_vm->_globals._saveData->_data[svField270] == 3)
-				_vm->_talkManager.PARLER_PERSO2("PATRON3.pe2");
+				_vm->_talkManager.startStaticCharacterDialogue("PATRON3.pe2");
 			if (_vm->_globals._saveData->_data[svField270] > 3) {
-				_vm->_talkManager.PARLER_PERSO2("PATRON4.pe2");
+				_vm->_talkManager.startStaticCharacterDialogue("PATRON4.pe2");
 				_vm->_globals._saveData->_data[svField270] = 5;
 			}
 			break;
@@ -720,27 +720,27 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			break;
 
 		case 40:
-			_vm->_talkManager.PARLER_PERSO("MAGE.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("MAGE.pe2");
 			break;
 
 		case 41:
-			_vm->_talkManager.PARLER_PERSO("MORT3.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("MORT3.pe2");
 			break;
 
 		case 42:
-			_vm->_talkManager.PARLER_PERSO("MORT2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("MORT2.pe2");
 			break;
 
 		case 43:
-			_vm->_talkManager.PARLER_PERSO("MORT1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("MORT1.pe2");
 			break;
 
 		case 44:
-			_vm->_talkManager.PARLER_PERSO("MORT3A.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("MORT3A.pe2");
 			break;
 
 		case 45:
-			_vm->_talkManager.PARLER_PERSO("FEM3.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("FEM3.pe2");
 			break;
 
 		case 46: {
@@ -818,11 +818,11 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 47:
-			_vm->_talkManager.PARLER_PERSO("BARMAN.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("BARMAN.pe2");
 			break;
 
 		case 48:
-			_vm->_talkManager.PARLER_PERSO("SAMAN2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("SAMAN2.pe2");
 			break;
 
 		case 49: {
@@ -903,16 +903,16 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 52:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("GARDE.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("GARDE.PE2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 53:
-			_vm->_talkManager.PARLER_PERSO("GARDE1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("GARDE1.pe2");
 			break;
 
 		case 54:
-			_vm->_talkManager.PARLER_PERSO("GARDE2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("GARDE2.pe2");
 			break;
 
 		case 55:
@@ -946,7 +946,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 58:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("Gm1.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("Gm1.PE2");
 			_vm->_globals._saveData->_data[svField176] = 1;
 			_vm->_globals._saveData->_data[svField270] = 2;
 			_vm->_globals._introSpeechOffFl = false;
@@ -1002,11 +1002,11 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 62:
-			_vm->_talkManager.OBJET_VIVANT("SBCADA.pe2");
+			_vm->_talkManager.animateObject("SBCADA.pe2");
 			break;
 
 		case 65:
-			_vm->_talkManager.OBJET_VIVANT("ScCADA.pe2");
+			_vm->_talkManager.animateObject("ScCADA.pe2");
 			break;
 
 		case 80: {
@@ -1117,12 +1117,12 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 83:
-			_vm->_talkManager.PARLER_PERSO("CVIGIL.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("CVIGIL.pe2");
 			break;
 
 		case 84:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("CVIGIL1.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("CVIGIL1.PE2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
@@ -1145,19 +1145,19 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 86:
 			if (_vm->_globals._saveData->_data[svField231] == 1) {
-				_vm->_talkManager.PARLER_PERSO("chotess1.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("chotess1.pe2");
 			} else {
 				_vm->_globals._introSpeechOffFl = true;
-				_vm->_talkManager.PARLER_PERSO("chotesse.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("chotesse.pe2");
 				_vm->_globals._introSpeechOffFl = false;
 			}
 			break;
 
 		case 87:
 			if (_vm->_globals._saveData->_data[svField188])
-				_vm->_talkManager.PARLER_PERSO("stand2.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("stand2.pe2");
 			else
-				_vm->_talkManager.PARLER_PERSO("stand1.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("stand1.pe2");
 			break;
 
 		case 88:
@@ -1301,9 +1301,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 94:
 			if (!_vm->_globals._saveData->_data[svField228])
-				_vm->_talkManager.PARLER_PERSO("flicn.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("flicn.pe2");
 			if (_vm->_globals._saveData->_data[svField228] == 1)
-				_vm->_talkManager.PARLER_PERSO("flicn1.pe2");
+				_vm->_talkManager.startAnimatedCharacterDialogue("flicn1.pe2");
 			break;
 
 		case 95:
@@ -1337,35 +1337,35 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 98:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("CVIGIL2.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("CVIGIL2.PE2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 100:
-			_vm->_talkManager.PARLER_PERSO("tourist.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("tourist.pe2");
 			break;
 
 		case 101:
-			_vm->_talkManager.PARLER_PERSO("tahi1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("tahi1.pe2");
 			break;
 
 		case 103:
 			// Dice game
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("tourist1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("tourist1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			_vm->_animationManager.playAnim2("T421.ANM", 100, 14, 500);
 			_vm->_eventsManager.VBL();
 			_vm->_eventsManager.VBL();
 			_vm->_eventsManager.VBL();
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("tourist2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("tourist2.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 104:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("tourist3.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("tourist3.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
@@ -1565,57 +1565,57 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 108:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("peche1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("peche1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 109:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("peche2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("peche2.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 110:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("peche3.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("peche3.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 111:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("peche4.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("peche4.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 112:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("teint1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("teint1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 113:
-			_vm->_talkManager.PARLER_PERSO("teint.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("teint.pe2");
 			break;
 
 		case 114:
-			_vm->_talkManager.PARLER_PERSO("tahibar.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("tahibar.pe2");
 			break;
 
 		case 115:
-			_vm->_talkManager.PARLER_PERSO("ilebar.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("ilebar.pe2");
 			break;
 
 		case 116:
-			_vm->_talkManager.PARLER_PERSO("Profred.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("Profred.pe2");
 			break;
 
 		case 170:
-			_vm->_talkManager.PARLER_PERSO("GRED.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("GRED.pe2");
 			break;
 
 		case 171: {
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("gred1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("gred1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			_vm->_globals.NOT_VERIF = true;
 			_vm->_objectsManager._oldCharacterPosX = _vm->_objectsManager.getSpriteX(0);
@@ -1638,12 +1638,12 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 172:
-			_vm->_talkManager.PARLER_PERSO("GBLEU.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("GBLEU.pe2");
 			break;
 
 		case 173: {
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("gbleu1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("gbleu1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			_vm->_globals.NOT_VERIF = true;
 			_vm->_objectsManager._oldCharacterPosX = _vm->_objectsManager.getSpriteX(0);
@@ -1666,7 +1666,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 174:
-			_vm->_talkManager.PARLER_PERSO("Profbl.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("Profbl.pe2");
 			break;
 
 		case 175:
@@ -1718,19 +1718,19 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 176:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("gred2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("gred2.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 177:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("gbleu2.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("gbleu2.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 200:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("Gm2.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("Gm2.PE2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
@@ -1748,7 +1748,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 202:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("SVGARD2.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("SVGARD2.PE2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
@@ -1812,7 +1812,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 207:
-			_vm->_talkManager.OBJET_VIVANT("PANNEAU.PE2");
+			_vm->_talkManager.animateObject("PANNEAU.PE2");
 			break;
 
 		case 208: {
@@ -1925,13 +1925,13 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 215:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("aviat.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("aviat.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
 		case 216:
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("aviat1.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("aviat1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			break;
 
@@ -1998,7 +1998,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				_vm->_eventsManager.VBL();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(12) != 6);
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("PRMORT.pe2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("PRMORT.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			do {
 				if (_vm->shouldQuit())
@@ -2034,7 +2034,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				_vm->_eventsManager.VBL();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(13) != 48);
 			_vm->_globals._introSpeechOffFl = true;
-			_vm->_talkManager.PARLER_PERSO("HRADIO.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("HRADIO.PE2");
 			_vm->_globals._introSpeechOffFl = false;
 			_vm->_graphicsManager.fadeOutLong();
 			_vm->_objectsManager.stopBobAnimation(13);
@@ -2188,7 +2188,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 
 		case 241:
-			_vm->_talkManager.PARLER_PERSO("RECEP.PE2");
+			_vm->_talkManager.startAnimatedCharacterDialogue("RECEP.PE2");
 			break;
 
 		// Resurrect Samantha's clone