diff options
Diffstat (limited to 'engines/hopkins/objects.cpp')
| -rw-r--r-- | engines/hopkins/objects.cpp | 282 |
1 files changed, 141 insertions, 141 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index e870ff72c9..cb054842c6 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -1735,7 +1735,7 @@ void ObjectsManager::GOHOME() { setSpriteIndex(0, _vm->_globals.g_old_sens + 59); _vm->_globals.ACTION_SENS = 0; if (_vm->_globals.GOACTION) - v54 = _vm->_globals.SAUVEGARDE->data[svField2]; + v54 = _vm->_globals._saveData->data[svField2]; else v54 = NUMZONE; _vm->_globals.chemin = (int16 *)g_PTRNUL; @@ -2076,7 +2076,7 @@ LABEL_153: if (nouveau_x == -1 && v48 == -1) { if (_vm->_globals.GOACTION) - v49 = _vm->_globals.SAUVEGARDE->data[svField2]; + v49 = _vm->_globals._saveData->data[svField2]; else v49 = NUMZONE; setSpriteIndex(0, _vm->_globals.g_old_sens + 59); @@ -2449,7 +2449,7 @@ void ObjectsManager::PLAN_BETA() { _vm->_graphicsManager.NOFADE = false; _vm->_globals.NOMARCHE = false; _spritePtr = g_PTRNUL; - _vm->_globals.SORTIE = 0; + _vm->_globals._exitId = 0; _vm->_globals.AFFLI = false; _vm->_globals.AFFIVBL = false; _vm->_globals.NOT_VERIF = 1; @@ -2502,15 +2502,15 @@ void ObjectsManager::PLAN_BETA() { do { v5 = _vm->_eventsManager.getMouseButton(); if (v5) { - if (_vm->_globals.SAUVEGARDE->data[svField170] == 1 && !_vm->_globals.SAUVEGARDE->data[svField171]) { - _vm->_globals.SAUVEGARDE->data[svField171] = 1; + if (_vm->_globals._saveData->data[svField170] == 1 && !_vm->_globals._saveData->data[svField171]) { + _vm->_globals._saveData->data[svField171] = 1; _vm->_globals.NOPARLE = true; _vm->_talkManager.PARLER_PERSO("APPEL1.pe2"); _vm->_globals.NOPARLE = false; v5 = 0; } - if (_vm->_globals.SAUVEGARDE->data[svField80] == 1 && !_vm->_globals.SAUVEGARDE->data[svField172]) { - _vm->_globals.SAUVEGARDE->data[svField172] = 1; + if (_vm->_globals._saveData->data[svField80] == 1 && !_vm->_globals._saveData->data[svField172]) { + _vm->_globals._saveData->data[svField172] = 1; _vm->_globals.NOPARLE = true; _vm->_talkManager.PARLER_PERSO("APPEL2.pe2"); _vm->_globals.NOPARLE = false; @@ -2528,7 +2528,7 @@ void ObjectsManager::PLAN_BETA() { PARADISE(); _vm->_eventsManager.VBL(); - if (_vm->_globals.SORTIE) + if (_vm->_globals._exitId) v1 = 1; } while (!_vm->shouldQuit() && v1 != 1); @@ -2580,35 +2580,35 @@ void ObjectsManager::handleLeftButton() { _vm->_dialogsManager.showInventory(); _vm->_dialogsManager._inventFl = false; _vm->_eventsManager._gameKey = KEY_NONE; - if (!_vm->_globals.SORTIE) { + if (!_vm->_globals._exitId) { _vm->_dialogsManager._inventFl = false; _vm->_eventsManager._mouseCursorId = v1; } return; } - if (_vm->_globals.SAUVEGARDE->data[svField354] == 1 + if (_vm->_globals._saveData->data[svField354] == 1 && !_vm->_globals.PLAN_FLAG && (uint16)(destX - 533) <= 26 && (uint16)(destY - 26) <= 33) { changeCharacterHead(CHARACTER_HOPKINS_CLONE, CHARACTER_HOPKINS); return; } - if (_vm->_globals.SAUVEGARDE->data[svField356] == 1 + if (_vm->_globals._saveData->data[svField356] == 1 && !_vm->_globals.PLAN_FLAG && (uint16)(destX - 533) <= 26 && (uint16)(destY - 26) <= 22) { changeCharacterHead(CHARACTER_SAMANTHA, CHARACTER_HOPKINS); return; } - if (_vm->_globals.SAUVEGARDE->data[svField357] == 1) { - if (_vm->_globals.SAUVEGARDE->data[svField353] == 1 + if (_vm->_globals._saveData->data[svField357] == 1) { + if (_vm->_globals._saveData->data[svField353] == 1 && !_vm->_globals.PLAN_FLAG && (uint16)(destX - 533) <= 26 && (uint16)(destY - 26) <= 33) { changeCharacterHead(CHARACTER_HOPKINS, CHARACTER_HOPKINS_CLONE); return; } - if (_vm->_globals.SAUVEGARDE->data[svField355] == 1 + if (_vm->_globals._saveData->data[svField355] == 1 && !_vm->_globals.PLAN_FLAG && (uint16)(destX - 567) <= 26 && (uint16)(destY - 26) <= 33) { @@ -2639,8 +2639,8 @@ void ObjectsManager::handleLeftButton() { if (_vm->_globals.GOACTION) { VERIFZONE(); _vm->_globals.GOACTION = false; - _vm->_globals.SAUVEGARDE->data[svField1] = 0; - _vm->_globals.SAUVEGARDE->data[svField2] = 0; + _vm->_globals._saveData->data[svField1] = 0; + _vm->_globals._saveData->data[svField2] = 0; } LABEL_38: if (_vm->_globals.PLAN_FLAG == true && (_vm->_eventsManager._mouseCursorId != 4 || NUMZONE <= 0)) @@ -2715,12 +2715,12 @@ LABEL_65: } if ((uint16)(NUMZONE + 1) > 1u) { // TODO: Reformat the weird if statement generated by the decompiler - 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->_eventsManager._mouseCursorId == 23 || (_vm->_globals._saveData->data[svField1] = _vm->_eventsManager._mouseCursorId, _vm->_eventsManager._mouseCursorId == 23)) + _vm->_globals._saveData->data[svField1] = 5; if (_vm->_globals.PLAN_FLAG == true) - _vm->_globals.SAUVEGARDE->data[svField1] = 6; - _vm->_globals.SAUVEGARDE->data[svField2] = NUMZONE; - _vm->_globals.SAUVEGARDE->data[svField3] = _vm->_globals._curObjectIndex; + _vm->_globals._saveData->data[svField1] = 6; + _vm->_globals._saveData->data[svField2] = NUMZONE; + _vm->_globals._saveData->data[svField3] = _vm->_globals._curObjectIndex; _vm->_globals.GOACTION = true; } _vm->_fontManager.hideText(5); @@ -2730,7 +2730,7 @@ LABEL_65: ARRET_PERSO_FLAG = 1; ARRET_PERSO_NUM = _vm->_globals.BOBZONE[NUMZONE]; } - if (_vm->_globals.ECRAN == 20 && _vm->_globals.SAUVEGARDE->data[svField132] == 1 + if (_vm->_globals._screenId == 20 && _vm->_globals._saveData->data[svField132] == 1 && _vm->_globals._curObjectIndex == 20 && NUMZONE == 12 && _vm->_eventsManager._mouseCursorId == 23) { // Special case for throwing darts at the switch in Purgatory - the player shouldn't move @@ -2749,8 +2749,8 @@ void ObjectsManager::PARADISE() { v1 = 0; ARRET_PERSO_FLAG = 0; ARRET_PERSO_NUM = 0; - result = _vm->_globals.SAUVEGARDE->data[svField1]; - if (result && _vm->_globals.SAUVEGARDE->data[svField2] && result != 4 && result > 3) { + result = _vm->_globals._saveData->data[svField1]; + if (result && _vm->_globals._saveData->data[svField2] && result != 4 && result > 3) { _vm->_fontManager.hideText(5); if (!_vm->_globals.forest || ((uint16)(NUMZONE - 20) > 1u && (uint16)(NUMZONE - 22) > 1u)) { if (_vm->_graphicsManager.DOUBLE_ECRAN) { @@ -2809,20 +2809,20 @@ LABEL_64: _vm->_eventsManager.VBL(); _vm->_graphicsManager.no_scroll = 0; } - _vm->_talkManager.REPONSE(_vm->_globals.SAUVEGARDE->data[svField2], _vm->_globals.SAUVEGARDE->data[svField1]); + _vm->_talkManager.REPONSE(_vm->_globals._saveData->data[svField2], _vm->_globals._saveData->data[svField1]); } else { - _vm->_talkManager.REPONSE2(_vm->_globals.SAUVEGARDE->data[svField2], _vm->_globals.SAUVEGARDE->data[svField1]); + _vm->_talkManager.REPONSE2(_vm->_globals._saveData->data[svField2], _vm->_globals._saveData->data[svField1]); } _vm->_eventsManager.changeMouseCursor(4); if ((uint16)(NUMZONE + 1) > 1u && !_vm->_globals.ZONEP[NUMZONE].field16) { NUMZONE = -1; _forceZoneFl = true; } - if (NUMZONE != _vm->_globals.SAUVEGARDE->data[svField2] || (uint16)(NUMZONE + 1) <= 1u) { + if (NUMZONE != _vm->_globals._saveData->data[svField2] || (uint16)(NUMZONE + 1) <= 1u) { _vm->_eventsManager._mouseCursorId = 4; _changeVerbFl = false; } else { - _vm->_eventsManager._mouseCursorId = _vm->_globals.SAUVEGARDE->data[svField1]; + _vm->_eventsManager._mouseCursorId = _vm->_globals._saveData->data[svField1]; if (_changeVerbFl) { VERBEPLUS(); _changeVerbFl = false; @@ -2833,8 +2833,8 @@ LABEL_64: 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; + _vm->_globals._saveData->data[svField1] = 0; + _vm->_globals._saveData->data[svField2] = 0; } if (_vm->_globals.PLAN_FLAG == true) { _vm->_eventsManager._mouseCursorId = 0; @@ -2883,8 +2883,8 @@ void ObjectsManager::CLEAR_ECRAN() { _vm->_eventsManager._startPos.x = 0; _vm->_eventsManager._mouseSpriteId = 0; Vold_taille = 200; - _vm->_globals.SAUVEGARDE->data[svField1] = 0; - _vm->_globals.SAUVEGARDE->data[svField2] = 0; + _vm->_globals._saveData->data[svField1] = 0; + _vm->_globals._saveData->data[svField2] = 0; _vm->_globals.GOACTION = false; _forceZoneFl = true; _changeVerbFl = false; @@ -2914,13 +2914,13 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha _vm->_globals.chemin = (int16 *)g_PTRNUL; if (oldCharacter == CHARACTER_SAMANTHA && newCharacter == CHARACTER_HOPKINS - && _vm->_globals.SAUVEGARDE->_realHopkins._location == _vm->_globals.ECRAN) { + && _vm->_globals._saveData->_realHopkins._location == _vm->_globals._screenId) { CH_TETE = 0; - loc = &_vm->_globals.SAUVEGARDE->_samantha; + loc = &_vm->_globals._saveData->_samantha; loc->_pos.x = getSpriteX(0); loc->_pos.y = getSpriteY(0); loc->field2 = 64; - loc->_location = _vm->_globals.ECRAN; + loc->_location = _vm->_globals._screenId; loc->field4 = _sprite[0]._animationType; removeSprite(1); @@ -2928,12 +2928,12 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha SPRITE_ON(1); removeSprite(0); - _vm->_globals.SAUVEGARDE->data[svField354] = 0; - _vm->_globals.SAUVEGARDE->data[svField356] = 0; - _vm->_globals.SAUVEGARDE->data[svField357] = 1; + _vm->_globals._saveData->data[svField354] = 0; + _vm->_globals._saveData->data[svField356] = 0; + _vm->_globals._saveData->data[svField357] = 1; T_RECTIF = 0; - loc = &_vm->_globals.SAUVEGARDE->_realHopkins; + loc = &_vm->_globals._saveData->_realHopkins; _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "PERSO.SPR"); _vm->_globals.PERSO = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); _vm->_globals.PERSO_TYPE = 0; @@ -2941,13 +2941,13 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha SPRITE_ON(0); _vm->_globals.HOPKINS_DATA(); } else if (oldCharacter == CHARACTER_HOPKINS && newCharacter == CHARACTER_SAMANTHA - && _vm->_globals.SAUVEGARDE->_samantha._location == _vm->_globals.ECRAN) { + && _vm->_globals._saveData->_samantha._location == _vm->_globals._screenId) { CH_TETE = 0; - loc = &_vm->_globals.SAUVEGARDE->_realHopkins; + loc = &_vm->_globals._saveData->_realHopkins; loc->_pos.x = getSpriteX(0); loc->_pos.y = getSpriteY(0); loc->field2 = 64; - loc->_location = _vm->_globals.ECRAN; + loc->_location = _vm->_globals._screenId; loc->field4 = _sprite[0].fieldC; removeSprite(1); @@ -2955,11 +2955,11 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha SPRITE_ON(1); removeSprite(0); - _vm->_globals.SAUVEGARDE->data[svField354] = 0; - _vm->_globals.SAUVEGARDE->data[svField356] = 1; - _vm->_globals.SAUVEGARDE->data[svField357] = 0; + _vm->_globals._saveData->data[svField354] = 0; + _vm->_globals._saveData->data[svField356] = 1; + _vm->_globals._saveData->data[svField357] = 0; - loc = &_vm->_globals.SAUVEGARDE->_samantha; + loc = &_vm->_globals._saveData->_samantha; _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "PSAMAN.SPR"); _vm->_globals.PERSO = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); _vm->_globals.PERSO_TYPE = 2; @@ -2969,27 +2969,27 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha } else { switch (oldCharacter) { case CHARACTER_HOPKINS: - loc = &_vm->_globals.SAUVEGARDE->_realHopkins; + loc = &_vm->_globals._saveData->_realHopkins; loc->_pos.x = getSpriteX(0); loc->_pos.y = getSpriteY(0); loc->field2 = 64; - loc->_location = _vm->_globals.ECRAN; + loc->_location = _vm->_globals._screenId; loc->field4 = _sprite[0].fieldC; break; case CHARACTER_HOPKINS_CLONE: - loc = &_vm->_globals.SAUVEGARDE->_cloneHopkins; + loc = &_vm->_globals._saveData->_cloneHopkins; loc->_pos.x = getSpriteX(0); loc->_pos.y = getSpriteY(0); loc->field2 = 64; - loc->_location = _vm->_globals.ECRAN; + loc->_location = _vm->_globals._screenId; loc->field4 = _sprite[0].fieldC; break; case CHARACTER_SAMANTHA: - loc = &_vm->_globals.SAUVEGARDE->_samantha; + loc = &_vm->_globals._saveData->_samantha; loc->_pos.x = getSpriteX(0); loc->_pos.y = getSpriteY(0); loc->field2 = 64; - loc->_location = _vm->_globals.ECRAN; + loc->_location = _vm->_globals._screenId; loc->field4 = _sprite[0].fieldC; break; default: @@ -2998,25 +2998,25 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha switch (newCharacter) { case CHARACTER_HOPKINS: - _vm->_globals.SAUVEGARDE->data[svField121] = 0; - _vm->_globals.SAUVEGARDE->data[svField354] = 0; - _vm->_globals.SAUVEGARDE->data[svField356] = 0; - _vm->_globals.SAUVEGARDE->data[svField357] = 1; - _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->_realHopkins._location; + _vm->_globals._saveData->data[svField121] = 0; + _vm->_globals._saveData->data[svField354] = 0; + _vm->_globals._saveData->data[svField356] = 0; + _vm->_globals._saveData->data[svField357] = 1; + _vm->_globals._exitId = _vm->_globals._saveData->_realHopkins._location; break; case CHARACTER_HOPKINS_CLONE: - _vm->_globals.SAUVEGARDE->data[svField121] = 1; - _vm->_globals.SAUVEGARDE->data[svField354] = 1; - _vm->_globals.SAUVEGARDE->data[svField356] = 0; - _vm->_globals.SAUVEGARDE->data[svField357] = 0; - _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->_cloneHopkins._location; + _vm->_globals._saveData->data[svField121] = 1; + _vm->_globals._saveData->data[svField354] = 1; + _vm->_globals._saveData->data[svField356] = 0; + _vm->_globals._saveData->data[svField357] = 0; + _vm->_globals._exitId = _vm->_globals._saveData->_cloneHopkins._location; break; case CHARACTER_SAMANTHA: - _vm->_globals.SAUVEGARDE->data[svField121] = 0; - _vm->_globals.SAUVEGARDE->data[svField354] = 0; - _vm->_globals.SAUVEGARDE->data[svField356] = 1; - _vm->_globals.SAUVEGARDE->data[svField357] = 0; - _vm->_globals.SORTIE = _vm->_globals.SAUVEGARDE->_samantha._location; + _vm->_globals._saveData->data[svField121] = 0; + _vm->_globals._saveData->data[svField354] = 0; + _vm->_globals._saveData->data[svField356] = 1; + _vm->_globals._saveData->data[svField357] = 0; + _vm->_globals._exitId = _vm->_globals._saveData->_samantha._location; break; } } @@ -3972,9 +3972,9 @@ void ObjectsManager::OPTI_OBJET() { return; if (v5 == 2) - v0 = _vm->_scriptManager.Control_Goto(data + 20 * v0); + v0 = _vm->_scriptManager.handleGoto(data + 20 * v0); if (v5 == 3) - v0 = _vm->_scriptManager.Control_If(data, v0); + v0 = _vm->_scriptManager.handleIf(data, v0); if (v0 == -1) error("defective IFF function"); if (v5 == 1 || v5 == 4) @@ -3991,40 +3991,40 @@ void ObjectsManager::SPECIAL_JEU() { byte *v2; byte *v3; - if ((uint16)(_vm->_globals.ECRAN - 35) <= 6u) { - if (_vm->_globals.OLD_ECRAN == 16 && _vm->_globals.ECRAN == 35) + if ((uint16)(_vm->_globals._screenId - 35) <= 6u) { + if (_vm->_globals.OLD_ECRAN == 16 && _vm->_globals._screenId == 35) TEST_FORET(35, 500, 555, 100, 440, 1); - if (_vm->_globals.OLD_ECRAN == 36 && _vm->_globals.ECRAN == 35) + if (_vm->_globals.OLD_ECRAN == 36 && _vm->_globals._screenId == 35) TEST_FORET(35, 6, 84, 100, 440, 4); - if (_vm->_globals.OLD_ECRAN == 35 && _vm->_globals.ECRAN == 36) + if (_vm->_globals.OLD_ECRAN == 35 && _vm->_globals._screenId == 36) TEST_FORET(36, 551, 633, 100, 440, 2); - if (_vm->_globals.OLD_ECRAN == 37 && _vm->_globals.ECRAN == 36) + if (_vm->_globals.OLD_ECRAN == 37 && _vm->_globals._screenId == 36) TEST_FORET(36, 6, 84, 100, 440, 4); - if (_vm->_globals.OLD_ECRAN == 36 && _vm->_globals.ECRAN == 37) + if (_vm->_globals.OLD_ECRAN == 36 && _vm->_globals._screenId == 37) TEST_FORET(37, 551, 633, 100, 440, 1); - if (_vm->_globals.OLD_ECRAN == 38 && _vm->_globals.ECRAN == 37) + if (_vm->_globals.OLD_ECRAN == 38 && _vm->_globals._screenId == 37) TEST_FORET(37, 392, 529, 100, 440, 2); - if (_vm->_globals.OLD_ECRAN == 37 && _vm->_globals.ECRAN == 38) + if (_vm->_globals.OLD_ECRAN == 37 && _vm->_globals._screenId == 38) TEST_FORET(38, 133, 252, 100, 440, 4); - if (_vm->_globals.OLD_ECRAN == 39 && _vm->_globals.ECRAN == 38) + if (_vm->_globals.OLD_ECRAN == 39 && _vm->_globals._screenId == 38) TEST_FORET(38, 6, 84, 100, 440, 3); - if (_vm->_globals.OLD_ECRAN == 38 && _vm->_globals.ECRAN == 39) + if (_vm->_globals.OLD_ECRAN == 38 && _vm->_globals._screenId == 39) TEST_FORET(39, 551, 633, 100, 440, 2); - if (_vm->_globals.OLD_ECRAN == 40 && _vm->_globals.ECRAN == 39) + if (_vm->_globals.OLD_ECRAN == 40 && _vm->_globals._screenId == 39) TEST_FORET(39, 6, 84, 100, 440, 3); - if (_vm->_globals.OLD_ECRAN == 39 && _vm->_globals.ECRAN == 40) + if (_vm->_globals.OLD_ECRAN == 39 && _vm->_globals._screenId == 40) TEST_FORET(40, 133, 252, 100, 440, 4); - if (_vm->_globals.OLD_ECRAN == 41 && _vm->_globals.ECRAN == 40) + if (_vm->_globals.OLD_ECRAN == 41 && _vm->_globals._screenId == 40) TEST_FORET(40, 392, 529, 100, 440, 2); - if (_vm->_globals.OLD_ECRAN == 40 && _vm->_globals.ECRAN == 41) + if (_vm->_globals.OLD_ECRAN == 40 && _vm->_globals._screenId == 41) TEST_FORET(41, 551, 633, 100, 440, 1); - if (_vm->_globals.OLD_ECRAN == 17 && _vm->_globals.ECRAN == 41) + if (_vm->_globals.OLD_ECRAN == 17 && _vm->_globals._screenId == 41) TEST_FORET(41, 6, 84, 100, 440, 3); } - if (_vm->_globals.ECRAN == 5) { + if (_vm->_globals._screenId == 5) { if (getSpriteY(0) <= 399) { - if (!_vm->_globals.SAUVEGARDE->data[svField173]) { - _vm->_globals.SAUVEGARDE->data[svField173] = 1; + if (!_vm->_globals._saveData->data[svField173]) { + _vm->_globals._saveData->data[svField173] = 1; _vm->_globals.NOPARLE = true; _vm->_talkManager.PARLER_PERSO("flicspe1.pe2"); _vm->_globals.NOPARLE = false; @@ -4073,31 +4073,31 @@ void ObjectsManager::SPECIAL_JEU() { } } } - if (_vm->_globals.ECRAN == 20) - _vm->_globals.SAUVEGARDE->data[svField132] = getSpriteX(0) > 65 + if (_vm->_globals._screenId == 20) + _vm->_globals._saveData->data[svField132] = getSpriteX(0) > 65 && getSpriteX(0) <= 124 && getSpriteY(0) > 372 && getSpriteY(0) <= 398; - if (_vm->_globals.ECRAN == 57) { + if (_vm->_globals._screenId == 57) { _vm->_globals._disableInventFl = true; - if (_vm->_globals.SAUVEGARDE->data[svField261] == 1 && BOBPOSI(5) == 37) { + if (_vm->_globals._saveData->data[svField261] == 1 && BOBPOSI(5) == 37) { stopBobAnimation(5); SET_BOBPOSI(5, 0); setBobAnimation(6); - _vm->_globals.SAUVEGARDE->data[svField261] = 2; + _vm->_globals._saveData->data[svField261] = 2; ZONE_OFF(15); _vm->_soundManager.PLAY_SOUND("SOUND75.WAV"); } - if (_vm->_globals.SAUVEGARDE->data[svField261] == 2 && BOBPOSI(6) == 6) { + if (_vm->_globals._saveData->data[svField261] == 2 && BOBPOSI(6) == 6) { stopBobAnimation(6); SET_BOBPOSI(6, 0); setBobAnimation(7); ZONE_ON(14); - _vm->_globals.SAUVEGARDE->data[svField261] = 3; + _vm->_globals._saveData->data[svField261] = 3; } _vm->_globals._disableInventFl = false; } - if (_vm->_globals.ECRAN == 93 && !_vm->_globals.SAUVEGARDE->data[svField333]) { + if (_vm->_globals._screenId == 93 && !_vm->_globals._saveData->data[svField333]) { _vm->_globals._disableInventFl = true; do _vm->_eventsManager.VBL(); @@ -4105,7 +4105,7 @@ void ObjectsManager::SPECIAL_JEU() { _vm->_globals.NOPARLE = true; _vm->_talkManager.PARLER_PERSO("GM3.PE2"); stopBobAnimation(8); - _vm->_globals.SAUVEGARDE->data[svField333] = 1; + _vm->_globals._saveData->data[svField333] = 1; _vm->_globals._disableInventFl = false; } } @@ -4630,11 +4630,11 @@ void ObjectsManager::INILINK(const Common::String &file) { } void ObjectsManager::SPECIAL_INI(const Common::String &a1) { - if (_vm->_globals.ECRAN == 73 && !_vm->_globals.SAUVEGARDE->data[svField318]) { + if (_vm->_globals._screenId == 73 && !_vm->_globals._saveData->data[svField318]) { _vm->_globals.CACHE_SUB(0); _vm->_globals.CACHE_SUB(1); } - if ((uint16)(_vm->_globals.ECRAN - 35) <= 6u) { + if ((uint16)(_vm->_globals._screenId - 35) <= 6u) { _vm->_globals.BOBZONE[20] = 1; _vm->_globals.BOBZONE[21] = 2; _vm->_globals.BOBZONE[22] = 3; @@ -4652,15 +4652,15 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) { _vm->_globals.ZONEP[22].field12 = 30; _vm->_globals.ZONEP[23].field12 = 30; for (int v2 = 200; v2 <= 214; v2++) { - if (_vm->_globals.SAUVEGARDE->data[v2] != 2) - _vm->_globals.SAUVEGARDE->data[v2] = 0; + if (_vm->_globals._saveData->data[v2] != 2) + _vm->_globals._saveData->data[v2] = 0; } } - if (_vm->_globals.ECRAN == 93) { - if (!_vm->_globals.SAUVEGARDE->data[svField333]) + if (_vm->_globals._screenId == 93) { + if (!_vm->_globals._saveData->data[svField333]) setBobAnimation(8); } - if (_vm->_globals.ECRAN == 18 && _vm->_globals.OLD_ECRAN == 17) { + if (_vm->_globals._screenId == 18 && _vm->_globals.OLD_ECRAN == 17) { _vm->_eventsManager._mouseSpriteId = 4; _vm->_globals.BPP_NOAFF = true; for (int v3 = 0; v3 <= 4; v3++) @@ -4675,7 +4675,7 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) { _vm->_graphicsManager.NOFADE = true; _vm->_globals._disableInventFl = false; } - if (_vm->_globals.ECRAN == 17 && _vm->_globals.OLD_ECRAN == 20) { + if (_vm->_globals._screenId == 17 && _vm->_globals.OLD_ECRAN == 20) { _vm->_globals._disableInventFl = true; _vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100); _vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100); @@ -4698,9 +4698,9 @@ void ObjectsManager::SPECIAL_INI(const Common::String &a1) { } if (!_vm->_soundManager._voiceOffFl) _vm->_soundManager.mixVoice(383, 4); - _vm->_globals.SAUVEGARDE->data[svField270] = 1; - _vm->_globals.SAUVEGARDE->data[svField300] = 1; - _vm->_globals.SAUVEGARDE->data[svField320] = 1; + _vm->_globals._saveData->data[svField270] = 1; + _vm->_globals._saveData->data[svField300] = 1; + _vm->_globals._saveData->data[svField320] = 1; if (_vm->_soundManager._voiceOffFl) { for (int v6 = 0; v6 <= 199; v6++) _vm->_eventsManager.VBL(); @@ -5128,75 +5128,75 @@ void ObjectsManager::TEST_FORET(int a1, int a2, int a3, int a4, int a5, int a6) char v7; v6 = a1; - if (_vm->_globals.ECRAN == a1) { + if (_vm->_globals._screenId == a1) { if (a1 == 35) { if (a6 > 2 || (v6 = 200, a6 > 2)) v6 = 201; } - if (_vm->_globals.ECRAN == 36) { + if (_vm->_globals._screenId == 36) { if (a6 > 2 || (v6 = 202, a6 > 2)) v6 = 203; } - if (_vm->_globals.ECRAN == 37) { + if (_vm->_globals._screenId == 37) { if (a6 > 2 || (v6 = 204, a6 > 2)) v6 = 205; } - if (_vm->_globals.ECRAN == 38) { + if (_vm->_globals._screenId == 38) { if (a6 > 2 || (v6 = 206, a6 > 2)) v6 = 207; } - if (_vm->_globals.ECRAN == 39) { + if (_vm->_globals._screenId == 39) { if (a6 > 2 || (v6 = 208, a6 > 2)) v6 = 209; } - if (_vm->_globals.ECRAN == 40) { + if (_vm->_globals._screenId == 40) { if (a6 > 2 || (v6 = 210, a6 > 2)) v6 = 211; } - if (_vm->_globals.ECRAN == 41) { + if (_vm->_globals._screenId == 41) { if (a6 > 2 || (v6 = 212, a6 > 2)) v6 = 213; } - v7 = _vm->_globals.SAUVEGARDE->data[v6]; + v7 = _vm->_globals._saveData->data[v6]; if (v7 != 2) { if (v7) { if (v7 == 1) { if (a6 == 1 && BOBPOSI(1) == 26) { _vm->_dialogsManager._removeInventFl = true; _vm->_soundManager.PLAY_SAMPLE2(1); - _vm->_globals.SAUVEGARDE->data[v6] = 4; + _vm->_globals._saveData->data[v6] = 4; } if (a6 == 2 && BOBPOSI(2) == 26) { _vm->_dialogsManager._removeInventFl = true; _vm->_soundManager.PLAY_SAMPLE2(1); - _vm->_globals.SAUVEGARDE->data[v6] = 4; + _vm->_globals._saveData->data[v6] = 4; } if (a6 == 3 && BOBPOSI(3) == 27) { _vm->_dialogsManager._removeInventFl = true; _vm->_soundManager.PLAY_SAMPLE2(1); - _vm->_globals.SAUVEGARDE->data[v6] = 4; + _vm->_globals._saveData->data[v6] = 4; } if (a6 == 4 && BOBPOSI(4) == 27) { _vm->_dialogsManager._removeInventFl = true; _vm->_soundManager.PLAY_SAMPLE2(1); _vm->_dialogsManager._removeInventFl = true; - _vm->_globals.SAUVEGARDE->data[v6] = 4; + _vm->_globals._saveData->data[v6] = 4; } } - if (_vm->_globals.SAUVEGARDE->data[v6] == 4) { + if (_vm->_globals._saveData->data[v6] == 4) { if (a6 == 1 && (signed int)BOBPOSI(1) > 30) - _vm->_globals.SAUVEGARDE->data[v6] = 3; + _vm->_globals._saveData->data[v6] = 3; if (a6 == 2 && (signed int)BOBPOSI(2) > 30) - _vm->_globals.SAUVEGARDE->data[v6] = 3; + _vm->_globals._saveData->data[v6] = 3; if (a6 == 3 && (signed int)BOBPOSI(3) > 30) - _vm->_globals.SAUVEGARDE->data[v6] = 3; + _vm->_globals._saveData->data[v6] = 3; if (a6 == 4 && (signed int)BOBPOSI(4) > 30) - _vm->_globals.SAUVEGARDE->data[v6] = 3; + _vm->_globals._saveData->data[v6] = 3; } - if (_vm->_globals.SAUVEGARDE->data[v6] == 3) { + if (_vm->_globals._saveData->data[v6] == 3) { _vm->_graphicsManager.FADE_LINUX = 2; _vm->_animationManager.playAnim("CREVE2.ANM", 100, 24, 500); - _vm->_globals.SORTIE = 150; + _vm->_globals._exitId = 150; _vm->_graphicsManager.NOFADE = true; BOB_OFF(1); BOB_OFF(2); @@ -5215,7 +5215,7 @@ void ObjectsManager::TEST_FORET(int a1, int a2, int a3, int a4, int a5, int a6) setBobAnimation(3); if (a6 == 4) setBobAnimation(4); - _vm->_globals.SAUVEGARDE->data[v6] = 1; + _vm->_globals._saveData->data[v6] = 1; } } } @@ -5243,7 +5243,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo _vm->_soundManager.WSOUND(v); _vm->_globals.chemin = (int16 *)g_PTRNUL; _vm->_globals.NOMARCHE = true; - _vm->_globals.SORTIE = 0; + _vm->_globals._exitId = 0; _vm->_globals.AFFLI = false; _vm->_globals.AFFIVBL = false; if (!backgroundFile.empty()) @@ -5260,7 +5260,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo _vm->_graphicsManager.INI_ECRAN2(s4); } _vm->_eventsManager.mouseOn(); - if (_vm->_globals.ECRAN == 61) { + if (_vm->_globals._screenId == 61) { SPRITE(_vm->_globals.PERSO, Common::Point(330, 418), 0, 60, 0, 0, 34, 190); SPRITE_ON(0); _vm->_globals.chemin = (int16 *)g_PTRNUL; @@ -5276,7 +5276,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo _vm->_eventsManager.VBL(); _vm->_globals.BPP_NOAFF = false; _vm->_graphicsManager.FADE_INW(); - if (_vm->_globals.ECRAN == 61) { + if (_vm->_globals._screenId == 61) { _vm->_animationManager.playSequence("OUVRE.SEQ", 10, 4, 10); stopBobAnimation(3); _vm->_globals.NOT_VERIF = 1; @@ -5306,9 +5306,9 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo VERIFZONE(); if (_vm->_globals.GOACTION) PARADISE(); - if (!_vm->_globals.SORTIE) { + if (!_vm->_globals._exitId) { _vm->_eventsManager.VBL(); - if (!_vm->_globals.SORTIE) + if (!_vm->_globals._exitId) continue; } v5 = 1; @@ -5319,7 +5319,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo _vm->_graphicsManager.FADE_OUTW(); if (!animFile.empty()) _vm->_graphicsManager.FIN_VISU(); - if (_vm->_globals.ECRAN == 61) + if (_vm->_globals._screenId == 61) removeSprite(0); CLEAR_ECRAN(); _vm->_globals.iRegul = 0; @@ -5340,7 +5340,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_globals.PLAN_FLAG = false; _vm->_graphicsManager.NOFADE = false; _vm->_globals.NOMARCHE = false; - _vm->_globals.SORTIE = 0; + _vm->_globals._exitId = 0; _vm->_globals.AFFLI = false; _vm->_globals.AFFIVBL = false; _vm->_globals.NOT_VERIF = 1; @@ -5368,20 +5368,20 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0); if (!_vm->_globals.PERSO_TYPE) goto LABEL_70; - if (!_vm->_globals.SAUVEGARDE->data[svField122] && !_vm->_globals.SAUVEGARDE->data[svField356]) { + if (!_vm->_globals._saveData->data[svField122] && !_vm->_globals._saveData->data[svField356]) { _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "PERSO.SPR"); _vm->_globals.PERSO = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); _vm->_globals.PERSO_TYPE = 0; } if (!_vm->_globals.PERSO_TYPE) { LABEL_70: - if (_vm->_globals.SAUVEGARDE->data[svField122] == 1) { + if (_vm->_globals._saveData->data[svField122] == 1) { _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "HOPFEM.SPR"); _vm->_globals.PERSO = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); _vm->_globals.PERSO_TYPE = 1; } } - if (_vm->_globals.PERSO_TYPE != 2 && _vm->_globals.SAUVEGARDE->data[svField356] == 1) { + if (_vm->_globals.PERSO_TYPE != 2 && _vm->_globals._saveData->data[svField356] == 1) { _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "PSAMAN.SPR"); _vm->_globals.PERSO = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER); _vm->_globals.PERSO_TYPE = 2; @@ -5436,7 +5436,7 @@ LABEL_70: if (yCheck == yp) { _vm->_globals.chemin = (int16 *)g_PTRNUL; PARADISE(); - if (_vm->_globals.SORTIE) + if (_vm->_globals._exitId) breakFlag = true; } } @@ -5448,7 +5448,7 @@ LABEL_70: handleRightButton(); } } - if (!_vm->_globals.SORTIE) { + if (!_vm->_globals._exitId) { _vm->_dialogsManager.testDialogOpening(); VERIFZONE(); if (_vm->_globals.chemin == (int16 *)g_PTRNUL @@ -5458,13 +5458,13 @@ LABEL_70: } SPECIAL_JEU(); _vm->_eventsManager.VBL(); - if (!_vm->_globals.SORTIE) + if (!_vm->_globals._exitId) continue; } breakFlag = true; } - if (_vm->_globals.SORTIE != 8 || _vm->_globals.ECRAN != 5 || _vm->_globals.HELICO != 1) { + if (_vm->_globals._exitId != 8 || _vm->_globals._screenId != 5 || _vm->_globals.HELICO != 1) { if (!_vm->_graphicsManager.NOFADE) _vm->_graphicsManager.FADE_OUTW(); _vm->_graphicsManager.NOFADE = false; |