diff options
Diffstat (limited to 'engines/hopkins/objects.cpp')
-rw-r--r-- | engines/hopkins/objects.cpp | 240 |
1 files changed, 120 insertions, 120 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 1da0420ac0..44123cb84f 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -1662,7 +1662,7 @@ void ObjectsManager::VERIFZONE() { } if (_vm->_globals.old_zone_68 != v4) { _vm->_graphicsManager.SETCOLOR4(251, 100, 100, 100); - _vm->_eventsManager.btsouris = 4; + _vm->_eventsManager._mouseCursorId = 4; _vm->_eventsManager.changeMouseCursor(4); if (_vm->_globals.zozo_73 == 1) { _vm->_fontManager.TEXTE_OFF(5); @@ -1695,17 +1695,17 @@ LABEL_54: _vm->_globals.force_to_data_0 = 0; _vm->_graphicsManager.SETCOLOR4(251, _vm->_globals.force_to_data_0, _vm->_globals.force_to_data_0, _vm->_globals.force_to_data_0); - if (_vm->_eventsManager.btsouris == 4) { + if (_vm->_eventsManager._mouseCursorId == 4) { v1 = 5 * v4; if (_vm->_globals.ZONEP[v4].field6 == 2) { _vm->_eventsManager.changeMouseCursor(16); - _vm->_eventsManager.btsouris = 16; + _vm->_eventsManager._mouseCursorId = 16; verbe = 16; } } } else { _vm->_graphicsManager.SETCOLOR4(251, 100, 100, 100); - _vm->_eventsManager.btsouris = 4; + _vm->_eventsManager._mouseCursorId = 4; _vm->_eventsManager.changeMouseCursor(4); } } @@ -1714,7 +1714,7 @@ LABEL_54: _vm->_globals.old_y_70 = v2; _vm->_globals.old_zone_68 = v4; if (_vm->_globals.NOMARCHE == true) { - if (_vm->_eventsManager.btsouris == 4) { + if (_vm->_eventsManager._mouseCursorId == 4) { v1 = v4 + 1; if ((uint16)(v4 + 1) > 1u) BTDROITE(); @@ -1722,7 +1722,7 @@ LABEL_54: } if ((_vm->_globals.PLAN_FLAG == true && v4 == -1) || !v4) { verbe = 0; - _vm->_eventsManager.btsouris = 0; + _vm->_eventsManager._mouseCursorId = 0; _vm->_eventsManager.changeMouseCursor(0); } } @@ -2635,7 +2635,7 @@ void ObjectsManager::PLAN_BETA() { _vm->_talkManager.PARLER_PERSO("APPEL2.pe2"); _vm->_globals.NOPARLE = false; v5 = 0; - _vm->_eventsManager.souris_bb = false; + _vm->_eventsManager._curMouseButton = 0; } if (v5 == 1) BTGAUCHE(); @@ -2693,14 +2693,14 @@ void ObjectsManager::BTGAUCHE() { destY = _vm->_eventsManager.getMouseY(); if (!_vm->_dialogsManager._inventFl && !_vm->_globals.PLAN_FLAG && destX > _vm->_graphicsManager.ofscroll - 30 && destX < _vm->_graphicsManager.ofscroll + 50 && (uint16)(destY + 29) <= 0x4Eu) { - v1 = _vm->_eventsManager.btsouris; + v1 = _vm->_eventsManager._mouseCursorId; _vm->_dialogsManager._inventFl = true; _vm->_dialogsManager.showInventory(); _vm->_dialogsManager._inventFl = false; _vm->_eventsManager._gameKey = KEY_NONE; if (!_vm->_globals.SORTIE) { _vm->_dialogsManager._inventFl = false; - _vm->_eventsManager.btsouris = v1; + _vm->_eventsManager._mouseCursorId = v1; } return; } @@ -2761,7 +2761,7 @@ void ObjectsManager::BTGAUCHE() { _vm->_globals.SAUVEGARDE->data[svField2] = 0; } LABEL_38: - if (_vm->_globals.PLAN_FLAG == true && (_vm->_eventsManager.btsouris != 4 || NUMZONE <= 0)) + if (_vm->_globals.PLAN_FLAG == true && (_vm->_eventsManager._mouseCursorId != 4 || NUMZONE <= 0)) return; if ((uint16)(NUMZONE + 1) > 1u) { zoneCount = NUMZONE; @@ -2833,7 +2833,7 @@ LABEL_65: } if ((uint16)(NUMZONE + 1) > 1u) { // TODO: Reformat the weird if statement generated by the decompiler - if (_vm->_eventsManager.btsouris == 23 || (_vm->_globals.SAUVEGARDE->data[svField1] = _vm->_eventsManager.btsouris, _vm->_eventsManager.btsouris == 23)) + if (_vm->_eventsManager._mouseCursorId == 23 || (_vm->_globals.SAUVEGARDE->data[svField1] = _vm->_eventsManager._mouseCursorId, _vm->_eventsManager._mouseCursorId == 23)) _vm->_globals.SAUVEGARDE->data[svField1] = 5; if (_vm->_globals.PLAN_FLAG == true) _vm->_globals.SAUVEGARDE->data[svField1] = 6; @@ -2844,13 +2844,13 @@ LABEL_65: _vm->_fontManager.TEXTE_OFF(5); _vm->_graphicsManager.SETCOLOR4(251, 100, 100, 100); ARRET_PERSO_FLAG = 0; - if (_vm->_eventsManager.btsouris == 21 && _vm->_globals.BOBZONE[NUMZONE]) { + if (_vm->_eventsManager._mouseCursorId == 21 && _vm->_globals.BOBZONE[NUMZONE]) { ARRET_PERSO_FLAG = 1; ARRET_PERSO_NUM = _vm->_globals.BOBZONE[NUMZONE]; } if (_vm->_globals.ECRAN == 20 && _vm->_globals.SAUVEGARDE->data[svField132] == 1 && _vm->_globals.OBJET_EN_COURS == 20 && NUMZONE == 12 - && _vm->_eventsManager.btsouris == 23) { + && _vm->_eventsManager._mouseCursorId == 23) { // Special case for throwing darts at the switch in Purgatory - the player shouldn't move _vm->_globals.chemin = (int16 *)g_PTRNUL; XSPR(0); @@ -2937,29 +2937,29 @@ LABEL_64: FORCEZONE = 1; } if (NUMZONE != _vm->_globals.SAUVEGARDE->data[svField2] || (uint16)(NUMZONE + 1) <= 1u) { - _vm->_eventsManager.btsouris = 4; + _vm->_eventsManager._mouseCursorId = 4; CHANGEVERBE = 0; } else { - _vm->_eventsManager.btsouris = _vm->_globals.SAUVEGARDE->data[svField1]; + _vm->_eventsManager._mouseCursorId = _vm->_globals.SAUVEGARDE->data[svField1]; if (CHANGEVERBE == 1) { VERBEPLUS(); CHANGEVERBE = 0; } - if (_vm->_eventsManager.btsouris == 5) - _vm->_eventsManager.btsouris = 4; + if (_vm->_eventsManager._mouseCursorId == 5) + _vm->_eventsManager._mouseCursorId = 4; } - if (_vm->_eventsManager.btsouris != 23) - _vm->_eventsManager.changeMouseCursor(_vm->_eventsManager.btsouris); + if (_vm->_eventsManager._mouseCursorId != 23) + _vm->_eventsManager.changeMouseCursor(_vm->_eventsManager._mouseCursorId); NUMZONE = 0; _vm->_globals.SAUVEGARDE->data[svField1] = 0; _vm->_globals.SAUVEGARDE->data[svField2] = 0; } if (_vm->_globals.PLAN_FLAG == true) { - _vm->_eventsManager.btsouris = 0; + _vm->_eventsManager._mouseCursorId = 0; _vm->_eventsManager.changeMouseCursor(0); } if (_vm->_globals.NOMARCHE == true) { - if (_vm->_eventsManager.btsouris == 4) { + if (_vm->_eventsManager._mouseCursorId == 4) { result = NUMZONE + 1; if ((uint16)(NUMZONE + 1) > 1u) BTDROITE(); @@ -2990,7 +2990,7 @@ void ObjectsManager::CLEAR_ECRAN() { _vm->_globals.BOBZONE_FLAG[v2] = false; ++v1; } while (v1 <= 48); - _vm->_eventsManager.btsouris = 4; + _vm->_eventsManager._mouseCursorId = 4; verbe = 4; NUMZONE = 0; Vold_taille = 0; @@ -3008,7 +3008,7 @@ void ObjectsManager::CLEAR_ECRAN() { if (g_PTRNUL != _vm->_globals.SPRITE_ECRAN) _vm->_globals.SPRITE_ECRAN = _vm->_globals.LIBERE_FICHIER(_vm->_globals.SPRITE_ECRAN); _vm->_eventsManager._startPos.x = 0; - _vm->_eventsManager.souris_n = 0; + _vm->_eventsManager._mouseSpriteId = 0; Vold_taille = 200; _vm->_globals.SAUVEGARDE->data[svField1] = 0; _vm->_globals.SAUVEGARDE->data[svField2] = 0; @@ -3614,8 +3614,8 @@ LABEL_88: void ObjectsManager::VERBEPLUS() { int v; - v = _vm->_eventsManager.btsouris + 1; - _vm->_eventsManager.btsouris = v; + v = _vm->_eventsManager._mouseCursorId + 1; + _vm->_eventsManager._mouseCursorId = v; if (v == 4) goto LABEL_24; if (v == 5) @@ -3662,150 +3662,150 @@ void ObjectsManager::VERBEPLUS() { goto LABEL_67; do { do { - _vm->_eventsManager.btsouris = 4; + _vm->_eventsManager._mouseCursorId = 4; LABEL_24: if (_vm->_globals.NOMARCHE != true || (v = NUMZONE + 1, (uint16)(NUMZONE + 1) <= 1u)) { - if (_vm->_eventsManager.btsouris == 4) + if (_vm->_eventsManager._mouseCursorId == 4) return; } else { - _vm->_eventsManager.btsouris = 5; + _vm->_eventsManager._mouseCursorId = 5; } LABEL_28: - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 6) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 6) { LABEL_29: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field6 == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 7) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 7) { LABEL_31: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field7 == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 8) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 8) { LABEL_33: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field8 == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 9) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 9) { LABEL_35: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field9 == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 10) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 10) { LABEL_37: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldA == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 11) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 11) { LABEL_39: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldB == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 12) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 12) { LABEL_41: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldC == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 13) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 13) { LABEL_43: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldD == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 14) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 14) { LABEL_45: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldE == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 15) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 15) { LABEL_47: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldF == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 16) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 16) { LABEL_49: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field6 == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 17) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 17) { LABEL_51: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field9 == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 18) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 18) { LABEL_53: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldA == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 19) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 19) { LABEL_55: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldB == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 20) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 20) { LABEL_57: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldC == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 21) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 21) { LABEL_59: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldF == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 22) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 22) { LABEL_61: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].fieldD == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 23) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 23) { LABEL_63: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field8 == 2) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 24) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 24) { LABEL_65: v = 5 * NUMZONE; if (_vm->_globals.ZONEP[NUMZONE].field9 == 3) return; } - v = _vm->_eventsManager.btsouris + 1; - _vm->_eventsManager.btsouris = v; + v = _vm->_eventsManager._mouseCursorId + 1; + _vm->_eventsManager._mouseCursorId = v; } while (v != 25); LABEL_67: v = 5 * NUMZONE; @@ -3815,9 +3815,9 @@ LABEL_67: void ObjectsManager::BTDROITE() { if ((uint16)(NUMZONE + 1) > 1u) { VERBEPLUS(); - if (_vm->_eventsManager.btsouris != 23) - _vm->_eventsManager.changeMouseCursor(_vm->_eventsManager.btsouris); - verbe = _vm->_eventsManager.btsouris; + if (_vm->_eventsManager._mouseCursorId != 23) + _vm->_eventsManager.changeMouseCursor(_vm->_eventsManager._mouseCursorId); + verbe = _vm->_eventsManager._mouseCursorId; } } @@ -4000,25 +4000,25 @@ void ObjectsManager::PARAMCADRE(int a1) { cadi = 0; } if (!a1) - _vm->_eventsManager.btsouris = 0; + _vm->_eventsManager._mouseCursorId = 0; if (a1 == 32) - _vm->_eventsManager.btsouris = 16; + _vm->_eventsManager._mouseCursorId = 16; if (a1 == 30) - _vm->_eventsManager.btsouris = 2; + _vm->_eventsManager._mouseCursorId = 2; if (a1 == 31) - _vm->_eventsManager.btsouris = 3; + _vm->_eventsManager._mouseCursorId = 3; if ((uint16)(a1 - 1) <= 0x1Cu) - _vm->_eventsManager.btsouris = 8; + _vm->_eventsManager._mouseCursorId = 8; if (a1 == 29) - _vm->_eventsManager.btsouris = 1; + _vm->_eventsManager._mouseCursorId = 1; if ((uint16)(a1 - 1) <= 0x1Bu && !_vm->_globals.INVENTAIRE[a1]) { - _vm->_eventsManager.btsouris = 0; + _vm->_eventsManager._mouseCursorId = 0; cadx = 0; cady = 0; cadi = 0; } - if (_vm->_eventsManager.btsouris != 23) - _vm->_eventsManager.changeMouseCursor(_vm->_eventsManager.btsouris); + if (_vm->_eventsManager._mouseCursorId != 23) + _vm->_eventsManager.changeMouseCursor(_vm->_eventsManager._mouseCursorId); _vm->_eventsManager.getMouseX(); _vm->_eventsManager.getMouseY(); } @@ -4028,79 +4028,79 @@ void ObjectsManager::OBJETPLUS(int idx) { int v2; int v3; - v1 = _vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris && _vm->_eventsManager.btsouris != 16 && (uint16)(_vm->_eventsManager.btsouris - 2) > 1u) { - v2 = _vm->_eventsManager.btsouris++ + 1; + v1 = _vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId && _vm->_eventsManager._mouseCursorId != 16 && (uint16)(_vm->_eventsManager._mouseCursorId - 2) > 1u) { + v2 = _vm->_eventsManager._mouseCursorId++ + 1; if (v1 == 5) goto LABEL_24; if (v2 == 7) goto LABEL_26; if (v2 != 8) { if (v2 == 9) - _vm->_eventsManager.btsouris = 10; - if (_vm->_eventsManager.btsouris == 10) + _vm->_eventsManager._mouseCursorId = 10; + if (_vm->_eventsManager._mouseCursorId == 10) goto LABEL_29; - if (_vm->_eventsManager.btsouris == 11) + if (_vm->_eventsManager._mouseCursorId == 11) goto LABEL_31; - if (_vm->_eventsManager.btsouris == 12) - _vm->_eventsManager.btsouris = 13; - if (_vm->_eventsManager.btsouris == 13) + if (_vm->_eventsManager._mouseCursorId == 12) + _vm->_eventsManager._mouseCursorId = 13; + if (_vm->_eventsManager._mouseCursorId == 13) goto LABEL_33; - if (_vm->_eventsManager.btsouris == 14) - _vm->_eventsManager.btsouris = 15; - if (_vm->_eventsManager.btsouris == 15) + if (_vm->_eventsManager._mouseCursorId == 14) + _vm->_eventsManager._mouseCursorId = 15; + if (_vm->_eventsManager._mouseCursorId == 15) goto LABEL_35; - if ((uint16)(_vm->_eventsManager.btsouris - 16) <= 6u) - _vm->_eventsManager.btsouris = 23; - if (_vm->_eventsManager.btsouris == 23) + if ((uint16)(_vm->_eventsManager._mouseCursorId - 16) <= 6u) + _vm->_eventsManager._mouseCursorId = 23; + if (_vm->_eventsManager._mouseCursorId == 23) goto LABEL_37; - if (_vm->_eventsManager.btsouris == 24) - _vm->_eventsManager.btsouris = 25; - if (_vm->_eventsManager.btsouris == 25) + if (_vm->_eventsManager._mouseCursorId == 24) + _vm->_eventsManager._mouseCursorId = 25; + if (_vm->_eventsManager._mouseCursorId == 25) goto LABEL_39; do { - _vm->_eventsManager.btsouris = 6; + _vm->_eventsManager._mouseCursorId = 6; LABEL_24: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field2 == 1) break; - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 7) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 7) { LABEL_26: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field3 == 1) return; } - v3 = _vm->_eventsManager.btsouris++; - if (_vm->_eventsManager.btsouris == 8) + v3 = _vm->_eventsManager._mouseCursorId++; + if (_vm->_eventsManager._mouseCursorId == 8) break; - _vm->_eventsManager.btsouris = v3 + 3; + _vm->_eventsManager._mouseCursorId = v3 + 3; if (v3 == 7) { LABEL_29: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field7 == 1) return; } - ++_vm->_eventsManager.btsouris; - if (_vm->_eventsManager.btsouris == 11) { + ++_vm->_eventsManager._mouseCursorId; + if (_vm->_eventsManager._mouseCursorId == 11) { LABEL_31: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field4 == 1) return; } - _vm->_eventsManager.btsouris += 2; - if (_vm->_eventsManager.btsouris == 13) { + _vm->_eventsManager._mouseCursorId += 2; + if (_vm->_eventsManager._mouseCursorId == 13) { LABEL_33: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field5 == 1) return; } - _vm->_eventsManager.btsouris += 2; - if (_vm->_eventsManager.btsouris == 15) { + _vm->_eventsManager._mouseCursorId += 2; + if (_vm->_eventsManager._mouseCursorId == 15) { LABEL_35: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field6 == 1) return; } - _vm->_eventsManager.btsouris = 23; + _vm->_eventsManager._mouseCursorId = 23; LABEL_37: if (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field6 == 2) break; - _vm->_eventsManager.btsouris = 25; + _vm->_eventsManager._mouseCursorId = 25; LABEL_39: ; } while (_vm->_globals.ObjetW[_vm->_globals.INVENTAIRE[idx]].field7 != 2); @@ -4109,7 +4109,7 @@ LABEL_39: } void ObjectsManager::VALID_OBJET(int a1) { - if (_vm->_eventsManager.btsouris == 8) + if (_vm->_eventsManager._mouseCursorId == 8) CHANGE_OBJET(a1); } @@ -4882,7 +4882,7 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) { BOBANIM_ON(8); } if (_vm->_globals.ECRAN == 18 && _vm->_globals.OLD_ECRAN == 17) { - _vm->_eventsManager.souris_n = 4; + _vm->_eventsManager._mouseSpriteId = 4; _vm->_globals.BPP_NOAFF = true; v3 = 0; do { @@ -4968,8 +4968,8 @@ void ObjectsManager::OPTI_BOBON(int a1, int a2, int a3, int a4, int a5, int a6, } void ObjectsManager::SCI_OPTI_ONE(int a1, int a2, int a3, int a4) { - _vm->_eventsManager.souris_bb = 0; - _vm->_eventsManager.souris_b = 0; + _vm->_eventsManager._curMouseButton = 0; + _vm->_eventsManager._mouseButton = 0; if (a4 != 3) { BOBANIM_ON(a1); @@ -4978,7 +4978,7 @@ void ObjectsManager::SCI_OPTI_ONE(int a1, int a2, int a3, int a4) { do { _vm->_eventsManager.VBL(); - if (_vm->_eventsManager.souris_bb) + if (_vm->_eventsManager._curMouseButton) break; } while (a3 != BOBPOSI(a1)); if (!a4) @@ -5630,7 +5630,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_graphicsManager.INI_ECRAN2(s4); } _vm->_eventsManager.mouseOn(); - _vm->_eventsManager.btsouris = 4; + _vm->_eventsManager._mouseCursorId = 4; _vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100); _vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100); _vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100); @@ -5671,7 +5671,7 @@ LABEL_70: _vm->_globals.chemin = (int16 *)g_PTRNUL; VERIFTAILLE(); SPECIAL_INI(linkFile); - _vm->_eventsManager.souris_n = 4; + _vm->_eventsManager._mouseSpriteId = 4; g_old_x = PERX; g_old_y = PERY; _vm->_globals.g_old_sens = -1; @@ -5697,7 +5697,7 @@ LABEL_70: mouseButtons = _vm->_eventsManager.getMouseButton(); if (mouseButtons) { if (mouseButtons == 1) { - if (verbe == 16 && _vm->_eventsManager.btsouris == 16) { + if (verbe == 16 && _vm->_eventsManager._mouseCursorId == 16) { xp = _vm->_eventsManager.getMouseX(); yp = _vm->_eventsManager.getMouseY(); |