HOPKINS: More refactoring in handleOpcode, some renaming

7 files changed, 132 insertions, 134 deletions

diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index a52c1badf8..fbfad43665 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -139,7 +139,7 @@ Globals::Globals() {
 	hauteur_boite = 0;
 	forest = false;
 	_objectWidth = _objectHeight = 0;
-	HELICO = 0;
+	_helicopterFl = false;
 	_catalogPos = 0;
 	_catalogSize = 0;
 	_newObjectFl = false;
@@ -174,8 +174,8 @@ Globals::Globals() {
 	GOACTION = false;
 	NECESSAIRE = false;
 	Compteur = 0;
-	ACTION_SENS = 0;
-	ACTION_SENS = 0;
+	_actionDirection = 0;
+	_actionDirection = 0;
 	SegmentEnCours = 0;
 	STOP_BUG = 0;
 	MAX_COMPTE = 0;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index c80d523b4a..0505ccea2a 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -396,7 +396,7 @@ public:
 	byte *PERSO;
 	int _objectWidth, _objectHeight;
 	bool _newObjectFl;
-	int HELICO;
+	bool _helicopterFl;
 	uint32 _catalogPos;
 	uint32 _catalogSize;
 	int iRegul;
@@ -439,7 +439,7 @@ public:
 	bool NECESSAIRE;
 	bool GOACTION;
 	int Compteur;
-	int ACTION_SENS;
+	int _actionDirection;
 	int SegmentEnCours;
 	int couleur_40;
 
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 10a18c7f97..0c34bb4d93 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -135,7 +135,7 @@ bool HopkinsEngine::runWin95Demo() {
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 
-	_globals.HELICO = 0;
+	_globals._helicopterFl = false;
 	_globals.iRegul = 1;
 
 	warning("TODO Affiche_Version(1)");
@@ -463,7 +463,7 @@ bool HopkinsEngine::runLinuxDemo() {
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 
-	_globals.HELICO = 0;
+	_globals._helicopterFl = false;
 	_eventsManager.mouseOff();
 
 	_graphicsManager.lockScreen();
@@ -2604,7 +2604,7 @@ bool HopkinsEngine::runWin95full() {
 	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
-	_globals.HELICO = 0;
+	_globals._helicopterFl = false;
 	_globals.iRegul = 1;
 
 	warning("TODO: Affiche_Version();");
@@ -3482,7 +3482,7 @@ bool HopkinsEngine::runLinuxFull() {
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 
-	_globals.HELICO = 0;
+	_globals._helicopterFl = false;
 	_eventsManager.mouseOff();
 
 	_graphicsManager.lockScreen();
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 118fcc3419..ac8e5fc43b 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -77,8 +77,8 @@ ObjectsManager::ObjectsManager() {
 	MAX_DEPA1 = 0;
 	CH_TETE = 0;
 	T_RECTIF = 0;
-	DESACTIVE = false;
-	DEUXPERSO = false;
+	_disableFl = false;
+	_twoCharactersFl = false;
 	PERX = PERY = 0;
 	PERI = 0;
 	RECALL = 0;
@@ -1733,7 +1733,7 @@ void ObjectsManager::GOHOME() {
 			g_old_y = nouveau_y;
 		} else {
 			setSpriteIndex(0, _vm->_globals.g_old_sens + 59);
-			_vm->_globals.ACTION_SENS = 0;
+			_vm->_globals._actionDirection = 0;
 			if (_vm->_globals.GOACTION)
 				v54 = _vm->_globals._saveData->data[svField2];
 			else
@@ -1757,7 +1757,7 @@ void ObjectsManager::GOHOME() {
 								_vm->_globals.ZONEP[v55].field4 = 0;
 							} else {
 								setSpriteIndex(0, v57);
-								_vm->_globals.ACTION_SENS = _vm->_globals.ZONEP[v55].field4 - 59;
+								_vm->_globals._actionDirection = _vm->_globals.ZONEP[v55].field4 - 59;
 							}
 						}
 					}
@@ -2080,7 +2080,7 @@ LABEL_153:
 			else
 				v49 = NUMZONE;
 			setSpriteIndex(0, _vm->_globals.g_old_sens + 59);
-			_vm->_globals.ACTION_SENS = 0;
+			_vm->_globals._actionDirection = 0;
 			_vm->_globals.chemin = (int16 *)g_PTRNUL;
 			VERIFTAILLE();
 			setFlipSprite(0, false);
@@ -2102,7 +2102,7 @@ LABEL_153:
 								_vm->_globals.ZONEP[v50].field4 = 0;
 							} else {
 								setSpriteIndex(0, v52);
-								_vm->_globals.ACTION_SENS = _vm->_globals.ZONEP[v50].field4 - 59;
+								_vm->_globals._actionDirection = _vm->_globals.ZONEP[v50].field4 - 59;
 							}
 						}
 					}
@@ -2682,7 +2682,7 @@ LABEL_64:
 		}
 		_vm->_globals.chemin = (int16 *)g_PTRNUL;
 		setSpriteIndex(0, _vm->_globals.g_old_sens2 + 59);
-		_vm->_globals.ACTION_SENS = 0;
+		_vm->_globals._actionDirection = 0;
 		_vm->_globals.chemin = (int16 *)g_PTRNUL;
 		VERIFTAILLE();
 		setFlipSprite(0, false);
@@ -5464,21 +5464,21 @@ LABEL_70:
 		breakFlag = true;
 	}
 
-	if (_vm->_globals._exitId != 8 || _vm->_globals._screenId != 5 || _vm->_globals.HELICO != 1) {
+	if (_vm->_globals._exitId != 8 || _vm->_globals._screenId != 5 || !_vm->_globals._helicopterFl) {
 		if (!_vm->_graphicsManager.NOFADE)
 			_vm->_graphicsManager.FADE_OUTW();
 		_vm->_graphicsManager.NOFADE = false;
 		removeSprite(0);
 		_vm->_globals.AFFLI = false;
-		if (DEUXPERSO == true) {
+		if (_twoCharactersFl) {
 			removeSprite(1);
-			DEUXPERSO = false;
+			_twoCharactersFl = false;
 		}
 		if (!animFile.empty())
 			_vm->_graphicsManager.FIN_VISU();
 		CLEAR_ECRAN();
 	} else {
-		_vm->_globals.HELICO = 0;
+		_vm->_globals._helicopterFl = false;
 	}
 	_vm->_globals.iRegul = 0;
 }
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 623847124c..8ad87ede17 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -102,8 +102,8 @@ public:
 	int MAX_DEPA1;
 	int CH_TETE;
 	int T_RECTIF;
-	bool DESACTIVE;
-	bool DEUXPERSO;
+	bool _disableFl;
+	bool _twoCharactersFl;
 	int PERX, PERY;
 	int PERI;
 	int RECALL;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index a93133fa13..a3dfa3a746 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -164,7 +164,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			}
 		}
 	} else if (dataP[2] == 'B' && dataP[3] == 'O' && dataP[4] == 'B') {
-		if (_vm->_objectsManager.DESACTIVE != true) {
+		if (!_vm->_objectsManager._disableFl) {
 			int v72 = *(dataP + 5);
 			v70 = *(dataP + 6);
 			int v4 = *(dataP + 7);
@@ -196,8 +196,8 @@ LABEL_1141:
 		}
 		opcodeType = 1;
 	} else if (dataP[2] == 'S' && dataP[3] == 'T' && dataP[4] == 'P') {
-			if (!_vm->_objectsManager.DESACTIVE) {
-				_vm->_objectsManager.DEUXPERSO = false;
+			if (!_vm->_objectsManager._disableFl) {
+				_vm->_objectsManager._twoCharactersFl = false;
 				int v5 = *(dataP + 5);
 				int v6 = (int16)READ_LE_UINT16(dataP + 8);
 				_vm->_objectsManager.PERX = (int16)READ_LE_UINT16(dataP + 6);
@@ -239,7 +239,7 @@ LABEL_1141:
 					    34,
 					    190);
 					_vm->_objectsManager.SPRITE_ON(1);
-					_vm->_objectsManager.DEUXPERSO = true;
+					_vm->_objectsManager._twoCharactersFl = true;
 				}
 				if (_vm->_globals._saveData->data[svField357] == 1
 				        && _vm->_globals._saveData->data[svField355] == 1
@@ -254,13 +254,13 @@ LABEL_1141:
 					    20,
 					    127);
 					_vm->_objectsManager.SPRITE_ON(1);
-					_vm->_objectsManager.DEUXPERSO = true;
+					_vm->_objectsManager._twoCharactersFl = true;
 				}
 			}
 			opcodeType = 1;
 			_vm->_objectsManager.CH_TETE = 0;
 	} else if (dataP[2] == 'S' && dataP[3] == 'T' && dataP[4] == 'E') {
-		if (_vm->_objectsManager.DESACTIVE != true) {
+		if (!_vm->_objectsManager._disableFl) {
 			int v7 = *(dataP + 5);
 			v70 = *(dataP + 6);
 			int v8 = *(dataP + 7);
@@ -276,7 +276,7 @@ LABEL_1141:
 		}
 		opcodeType = 1;
 	} else if (dataP[2] == 'B' && dataP[3] == 'O' && dataP[4] == 'F') {
-		if (_vm->_objectsManager.DESACTIVE != true)
+		if (!_vm->_objectsManager._disableFl)
 			_vm->_objectsManager.VBOB_OFF((int16)READ_LE_UINT16(dataP + 5));
 		opcodeType = 1;
 	} else if (dataP[2] == 'P' && dataP[3] == 'E' && dataP[4] == 'R') {
@@ -285,179 +285,177 @@ LABEL_1141:
 			v70 = 0;
 			if ((int16)READ_LE_UINT16(dataP + 5) == 14)
 				v73 = 1;
-			if (v73 == 17)
-				v73 = 7;
-			if (v73 == 18)
-				v73 = 8;
-			if (v73 == 19)
-				v73 = 4;
-			if (v73 == 15)
-				v73 = 11;
-			if (v73 == 16)
-				v73 = 12;
-			if (v73 == 1) {
-				if (_vm->_globals.ACTION_SENS == 1)
+
+			switch (v73) {
+			case 1:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(4);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(4);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(4);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(4);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(4);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(4);
-			}
-			if (v73 == 2) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 2:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(7);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(7);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(7);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(7);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(7);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(7);
-				if (_vm->_globals.ACTION_SENS == 1)
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(8);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(8);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(8);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(8);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(8);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(8);
-			}
-			if (v73 == 4) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 19:
+			case 4:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(1);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(1);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(1);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(1);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(1);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(1);
-			}
-			if (v73 == 5) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 5:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(5);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(5);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(5);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(5);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(5);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(5);
-				if (_vm->_globals.ACTION_SENS == 1)
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(6);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(6);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(6);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(6);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(6);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(6);
-			}
-			if (v73 == 7) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 17:
+			case 7:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(2);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(2);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(2);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(2);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(2);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(2);
-			}
-			if (v73 == 8) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 18:
+			case 8:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(3);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(3);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(3);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(3);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(3);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(3);
-			}
-			if (v73 == 9) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 9:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(5);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(5);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(5);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(5);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(5);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(5);
-			}
-			if (v73 == 10) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 10:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(6);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(6);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(6);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(6);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(6);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(6);
-			}
-			if (v73 == 11) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 15:
+			case 11:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(7);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(7);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(7);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(7);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(7);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(7);
-			}
-			if (v73 == 12) {
-				if (_vm->_globals.ACTION_SENS == 1)
+				break;
+			case 16:
+			case 12:
+				if (_vm->_globals._actionDirection == 1)
 					_vm->_objectsManager.ACTION_DOS(8);
-				if (_vm->_globals.ACTION_SENS == 3)
+				if (_vm->_globals._actionDirection == 3)
 					_vm->_objectsManager.ACTION_DROITE(8);
-				if (_vm->_globals.ACTION_SENS == 2)
+				if (_vm->_globals._actionDirection == 2)
 					_vm->_objectsManager.Q_DROITE(8);
-				if (_vm->_globals.ACTION_SENS == 5)
+				if (_vm->_globals._actionDirection == 5)
 					_vm->_objectsManager.ACTION_FACE(8);
-				if (_vm->_globals.ACTION_SENS == 8)
+				if (_vm->_globals._actionDirection == 8)
 					_vm->_objectsManager.Q_GAUCHE(8);
-				if (_vm->_globals.ACTION_SENS == 7)
+				if (_vm->_globals._actionDirection == 7)
 					_vm->_objectsManager.ACTION_GAUCHE(8);
+				break;
 			}
 		}
 		opcodeType = 1;
@@ -611,7 +609,7 @@ LABEL_1141:
 				_vm->_graphicsManager.FADE_OUTW();
 
 			_vm->_globals._disableInventFl = false;
-			_vm->_globals.HELICO = 1;
+			_vm->_globals._helicopterFl = true;
 			break;
 
 		case 16:
@@ -2240,7 +2238,7 @@ LABEL_1141:
 			_vm->_globals._saveData->data[svField354] = 0;
 			_vm->_globals._saveData->data[svField356] = 0;
 			_vm->_globals._saveData->data[svField355] = 1;
-			_vm->_objectsManager.DEUXPERSO = true;
+			_vm->_objectsManager._twoCharactersFl = true;
 			_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.SPRITE_ECRAN, 373, 191, 3);
 			_vm->_objectsManager.SPRITE(_vm->_globals.TETE, v53->_pos, 1, 3, v53->field4, 0, 20, 127);
 			_vm->_objectsManager.SPRITE_ON(1);
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 4d6c880b7f..339646a491 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -1247,10 +1247,10 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
 
 	_vm->_globals.freeMemory(_vm->_globals.COUCOU);
 	_vm->_globals.COUCOU = v11;
-	_vm->_objectsManager.DESACTIVE = true;
+	_vm->_objectsManager._disableFl = true;
 	_vm->_objectsManager.INILINK(v20);
 	_vm->_graphicsManager.INI_ECRAN2(v20);
-	_vm->_objectsManager.DESACTIVE = false;
+	_vm->_objectsManager._disableFl = false;
 	_vm->_globals.NOMARCHE = false;
 	if (_vm->_globals._exitId == 101)
 		_vm->_globals._exitId = 0;