From d7ea7ca378b62d2809ae5f56c031c8ea7f31de96 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 1 Mar 2013 07:57:11 +0100 Subject: HOPKINS: Rename some more savegame indexes --- engines/hopkins/dialogs.cpp | 4 +-- engines/hopkins/globals.h | 32 ++++++++++++----------- engines/hopkins/hopkins.cpp | 60 ++++++++++++++++++++++---------------------- engines/hopkins/objects.cpp | 12 ++++----- engines/hopkins/saveload.cpp | 8 +++--- engines/hopkins/script.cpp | 14 +++++------ engines/hopkins/talk.cpp | 10 +++----- 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp index 2b23f20fc4..49d690c385 100644 --- a/engines/hopkins/dialogs.cpp +++ b/engines/hopkins/dialogs.cpp @@ -417,8 +417,8 @@ void DialogsManager::showInventory() { _vm->_scriptManager._tempObjectFl = true; _vm->_globals._saveData->_data[svLastObjectIndex] = _vm->_objectsManager._curObjectIndex; - _vm->_globals._saveData->_data[svUseless8] = _vm->_globals._inventory[newInventoryItem]; - _vm->_globals._saveData->_data[svUseless9] = _vm->_eventsManager._mouseCursorId; + _vm->_globals._saveData->_data[svLastInventoryItem] = _vm->_globals._inventory[newInventoryItem]; + _vm->_globals._saveData->_data[svLastInvMouseCursor] = _vm->_eventsManager._mouseCursorId; _vm->_objectsManager.OPTI_OBJET(); _vm->_scriptManager._tempObjectFl = false; diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index 58a34e5324..8c9662cdff 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -121,25 +121,25 @@ enum SauvegardeOffset { svLastMouseCursor = 1 , svLastZoneNum = 2 , svLastObjectIndex = 3 - , svUseless4 = 4 - , svLastScreenId5 = 5 - , svLastScreenId6 = 6 - , svUseless8 = 8 - , svUseless9 = 9 - , svUseless10 = 10 - , svField80 = 80 + , svDialogField4 = 4 + , svLastScreenId = 5 + , svLastPrevScreenId = 6 + , svLastInventoryItem = 8 + , svLastInvMouseCursor = 9 + , svLastSavegameSlot = 10 + , svFreedHostageFl = 80 , svField94 = 94 , svField95 = 95 - , svField113 = 113 - , svField117 = 117 - , svUseless21 = 121 - , svField122 = 122 - , svField123 = 123 + , svForestAvailableFl = 113 + , svHutBurningFl = 117 + , svHopkinsCloneFl = 121 + , svAlternateSpriteFl = 122 + , svHeavenGuardGoneFl = 123 , svField132 = 132 , svField133 = 133 - , svField135 = 135 - , svField166 = 166 - , svField167 = 167 + , svGameWonFl = 135 + , svCinemaCurtainCond1 = 166 + , svCinemaCurtainCond2 = 167 , svField170 = 170 , svField171 = 171 , svField172 = 172 @@ -151,6 +151,8 @@ enum SauvegardeOffset { , svField184 = 184 , svField186 = 186 , svField188 = 188 + , svField200 = 200 + , svField214 = 214 , svField220 = 220 , svField225 = 225 , svField228 = 228 diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 9bc4efd472..7fd9936111 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -231,8 +231,8 @@ bool HopkinsEngine::runWin95Demo() { _linesManager.setMaxLineIdx(5); _globals._characterMaxPosY = 455; - if (_globals._saveData->_data[svField80]) { - if (_globals._saveData->_data[svField80] == 1) + if (_globals._saveData->_data[svFreedHostageFl]) { + if (_globals._saveData->_data[svFreedHostageFl] == 1) _objectsManager.PERSONAGE2("IM05", "IM05A", "ANIM05B", "IM05", 3, false); } else { _objectsManager.PERSONAGE2("IM05", "IM05", "ANIM05", "IM05", 3, false); @@ -332,9 +332,9 @@ bool HopkinsEngine::runWin95Demo() { case 113: _globals._exitId = 0; _globals._prevScreenId = _globals._screenId; - _globals._saveData->_data[svLastScreenId6] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._screenId; _globals._screenId = 113; - _globals._saveData->_data[svLastScreenId5] = _globals._screenId; + _globals._saveData->_data[svLastScreenId] = _globals._screenId; _computerManager.showComputer(COMPUTER_HOPKINS); _graphicsManager.lockScreen(); _graphicsManager.clearScreen(); @@ -348,9 +348,9 @@ bool HopkinsEngine::runWin95Demo() { case 114: _globals._prevScreenId = _globals._screenId; - _globals._saveData->_data[svLastScreenId6] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._screenId; _globals._screenId = 114; - _globals._saveData->_data[svLastScreenId5] = _globals._screenId; + _globals._saveData->_data[svLastScreenId] = _globals._screenId; _globals._exitId = 0; _computerManager.showComputer(COMPUTER_SAMANTHA); _graphicsManager.lockScreen(); @@ -361,9 +361,9 @@ bool HopkinsEngine::runWin95Demo() { case 115: _globals._exitId = 0; _globals._prevScreenId = _globals._screenId; - _globals._saveData->_data[svLastScreenId6] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._screenId; _globals._screenId = 115; - _globals._saveData->_data[svLastScreenId5] = _globals._screenId; + _globals._saveData->_data[svLastScreenId] = _globals._screenId; _computerManager.showComputer(COMPUTER_PUBLIC); _graphicsManager.lockScreen(); _graphicsManager.clearScreen(); @@ -538,7 +538,7 @@ bool HopkinsEngine::runLinuxDemo() { case 5: _linesManager.setMaxLineIdx(5); _globals._characterMaxPosY = 455; - if (_globals._saveData->_data[svField80] == 1) + if (_globals._saveData->_data[svFreedHostageFl] == 1) _objectsManager.PERSONAGE2("IM05", "IM05A", "ANIM05B", "IM05", 3, false); else _objectsManager.PERSONAGE2("IM05", "IM05", "ANIM05", "IM05", 3, false); @@ -612,9 +612,9 @@ bool HopkinsEngine::runLinuxDemo() { _linesManager.setMaxLineIdx(5); _globals._characterMaxPosY = 450; - if (_globals._saveData->_data[svField113] == 1) { + if (_globals._saveData->_data[svForestAvailableFl] == 1) { _objectsManager.PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7, true); - } else if (!_globals._saveData->_data[svField113]) { + } else if (!_globals._saveData->_data[svForestAvailableFl]) { _objectsManager.PERSONAGE2("IM16", "IM16", "ANIM16", "IM16", 7, true); } break; @@ -649,9 +649,9 @@ bool HopkinsEngine::runLinuxDemo() { case 113: _globals._exitId = 0; _globals._prevScreenId = _globals._screenId; - _globals._saveData->_data[svLastScreenId6] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._screenId; _globals._screenId = 113; - _globals._saveData->_data[svLastScreenId5] = 113; + _globals._saveData->_data[svLastScreenId] = 113; _computerManager.showComputer(COMPUTER_HOPKINS); _graphicsManager.lockScreen(); @@ -667,9 +667,9 @@ bool HopkinsEngine::runLinuxDemo() { case 114: _globals._exitId = 0; _globals._prevScreenId = _globals._screenId; - _globals._saveData->_data[svLastScreenId6] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._screenId; _globals._screenId = 114; - _globals._saveData->_data[svLastScreenId5] = 114; + _globals._saveData->_data[svLastScreenId] = 114; _computerManager.showComputer(COMPUTER_SAMANTHA); _graphicsManager.lockScreen(); _graphicsManager.clearScreen(); @@ -679,9 +679,9 @@ bool HopkinsEngine::runLinuxDemo() { case 115: _globals._exitId = 0; _globals._prevScreenId = _globals._screenId; - _globals._saveData->_data[svLastScreenId6] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._screenId; _globals._screenId = 115; - _globals._saveData->_data[svLastScreenId5] = 115; + _globals._saveData->_data[svLastScreenId] = 115; _computerManager.showComputer(COMPUTER_PUBLIC); _graphicsManager.lockScreen(); _graphicsManager.clearScreen(); @@ -882,7 +882,7 @@ bool HopkinsEngine::runFull() { case 5: _linesManager.setMaxLineIdx(5); _globals._characterMaxPosY = 455; - if (_globals._saveData->_data[svField80] == 1) + if (_globals._saveData->_data[svFreedHostageFl] == 1) _objectsManager.PERSONAGE2("IM05", "IM05A", "ANIM05B", "IM05", 3, false); else _objectsManager.PERSONAGE2("IM05", "IM05", "ANIM05", "IM05", 3, false); @@ -957,7 +957,7 @@ bool HopkinsEngine::runFull() { case 16: _linesManager.setMaxLineIdx(5); _globals._characterMaxPosY = 450; - if (_globals._saveData->_data[svField113] == 1) + if (_globals._saveData->_data[svForestAvailableFl] == 1) _objectsManager.PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7, true); else _objectsManager.PERSONAGE2("IM16", "IM16", "ANIM16", "IM16", 7, true); @@ -966,9 +966,9 @@ bool HopkinsEngine::runFull() { case 17: _linesManager.setMaxLineIdx(40); _globals._characterMaxPosY = 440; - if (_globals._saveData->_data[svField117] == 1) + if (_globals._saveData->_data[svHutBurningFl] == 1) _objectsManager.PERSONAGE2("IM17", "IM17A", "ANIM17", "IM17", 11, true); - else if (!_globals._saveData->_data[svField117]) + else if (!_globals._saveData->_data[svHutBurningFl]) _objectsManager.PERSONAGE2("IM17", "IM17", "ANIM17", "IM17", 11, true); if (_globals._exitId == 18) { _globals.iRegul = 1; @@ -1006,7 +1006,7 @@ bool HopkinsEngine::runFull() { case 19: _linesManager.setMaxLineIdx(40); _globals._characterMaxPosY = 440; - if (_globals._saveData->_data[svField123]) + if (_globals._saveData->_data[svHeavenGuardGoneFl]) _objectsManager.PERSONAGE2("IM19", "IM19A", "ANIM19", "IM19", 6, true); else _objectsManager.PERSONAGE2("IM19", "IM19", "ANIM19", "IM19", 6, true); @@ -1084,7 +1084,7 @@ bool HopkinsEngine::runFull() { case 28: _linesManager.setMaxLineIdx(5); _globals._characterMaxPosY = 450; - if (_globals._saveData->_data[svField166] != 1 || _globals._saveData->_data[svField167] != 1) + if (_globals._saveData->_data[svCinemaCurtainCond1] != 1 || _globals._saveData->_data[svCinemaCurtainCond2] != 1) _objectsManager.PERSONAGE2("IM28", "IM28", "ANIM28", "IM28", 1, false); else _objectsManager.PERSONAGE2("IM28A", "IM28", "ANIM28", "IM28", 1, false); @@ -1423,8 +1423,8 @@ bool HopkinsEngine::runFull() { case 113: _globals._prevScreenId = _globals._screenId; _globals._screenId = 113; - _globals._saveData->_data[svLastScreenId6] = _globals._prevScreenId; - _globals._saveData->_data[svLastScreenId5] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._prevScreenId; + _globals._saveData->_data[svLastScreenId] = _globals._screenId; _globals._exitId = 0; _computerManager.showComputer(COMPUTER_HOPKINS); _graphicsManager.lockScreen(); @@ -1441,8 +1441,8 @@ bool HopkinsEngine::runFull() { _globals._exitId = 0; _globals._prevScreenId = _globals._screenId; _globals._screenId = 114; - _globals._saveData->_data[svLastScreenId6] = _globals._prevScreenId; - _globals._saveData->_data[svLastScreenId5] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._prevScreenId; + _globals._saveData->_data[svLastScreenId] = _globals._screenId; _computerManager.showComputer(COMPUTER_SAMANTHA); _graphicsManager.lockScreen(); _graphicsManager.clearScreen(); @@ -1452,8 +1452,8 @@ bool HopkinsEngine::runFull() { case 115: _globals._prevScreenId = _globals._screenId; _globals._screenId = 115; - _globals._saveData->_data[svLastScreenId6] = _globals._prevScreenId; - _globals._saveData->_data[svLastScreenId5] = _globals._screenId; + _globals._saveData->_data[svLastPrevScreenId] = _globals._prevScreenId; + _globals._saveData->_data[svLastScreenId] = _globals._screenId; _globals._exitId = 0; _computerManager.showComputer(COMPUTER_PUBLIC); _graphicsManager.lockScreen(); @@ -2119,7 +2119,7 @@ void HopkinsEngine::playEnding() { while (_objectsManager.getBobAnimDataIdx(7) != 120); _objectsManager.stopBobAnimation(7); - if (_globals._saveData->_data[svField135] == 1) { + if (_globals._saveData->_data[svGameWonFl] == 1) { _soundManager._specialSoundNum = 200; _soundManager._skipRefreshFl = true; _graphicsManager.FADE_LINUX = 2; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index e5ca2c9578..e168568974 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -1784,7 +1784,7 @@ void ObjectsManager::handleCityMap() { _vm->_globals._introSpeechOffFl = false; mouseButton = 0; } - if (_vm->_globals._saveData->_data[svField80] == 1 && !_vm->_globals._saveData->_data[svField172]) { + if (_vm->_globals._saveData->_data[svFreedHostageFl] == 1 && !_vm->_globals._saveData->_data[svField172]) { _vm->_globals._saveData->_data[svField172] = 1; _vm->_globals._introSpeechOffFl = true; _vm->_talkManager.startAnimatedCharacterDialogue("APPEL2.pe2"); @@ -2181,21 +2181,21 @@ void ObjectsManager::changeCharacterHead(PlayerCharacter oldCharacter, PlayerCha switch (newCharacter) { case CHARACTER_HOPKINS: - _vm->_globals._saveData->_data[svUseless21] = 0; + _vm->_globals._saveData->_data[svHopkinsCloneFl] = 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._saveData->_data[svUseless21] = 1; + _vm->_globals._saveData->_data[svHopkinsCloneFl] = 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._saveData->_data[svUseless21] = 0; + _vm->_globals._saveData->_data[svHopkinsCloneFl] = 0; _vm->_globals._saveData->_data[svField354] = 0; _vm->_globals._saveData->_data[svField356] = 1; _vm->_globals._saveData->_data[svField357] = 0; @@ -3785,12 +3785,12 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100); _vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0); if (_vm->_globals._characterType) { - if (!_vm->_globals._saveData->_data[svField122] && !_vm->_globals._saveData->_data[svField356]) { + if (!_vm->_globals._saveData->_data[svAlternateSpriteFl] && !_vm->_globals._saveData->_data[svField356]) { _vm->_globals.PERSO = _vm->_fileManager.loadFile("PERSO.SPR"); _vm->_globals._characterType = 0; } } - if (!_vm->_globals._characterType && _vm->_globals._saveData->_data[svField122] == 1) { + if (!_vm->_globals._characterType && _vm->_globals._saveData->_data[svAlternateSpriteFl] == 1) { _vm->_globals.PERSO = _vm->_fileManager.loadFile("HOPFEM.SPR"); _vm->_globals._characterType = 1; } diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp index d958f8c10d..3fbe241f30 100644 --- a/engines/hopkins/saveload.cpp +++ b/engines/hopkins/saveload.cpp @@ -142,7 +142,7 @@ void SaveLoadManager::writeSavegameHeader(Common::OutSaveFile *out, hopkinsSaveg Common::Error SaveLoadManager::saveGame(int slot, const Common::String &saveName) { /* Pack any necessary data into the savegame data structure */ // Set the selected slot number - _vm->_globals._saveData->_data[svUseless10] = slot; + _vm->_globals._saveData->_data[svLastSavegameSlot] = slot; // Set up the inventory for (int i = 0; i < 35; ++i) @@ -203,9 +203,9 @@ Common::Error SaveLoadManager::loadGame(int slot) { _vm->_globals._inventory[i] = _vm->_globals._saveData->_inventory[i]; // Set variables from loaded data as necessary - _vm->_globals._saveData->_data[svUseless10] = slot; - _vm->_globals._exitId = _vm->_globals._saveData->_data[svLastScreenId5]; - _vm->_globals._saveData->_data[svLastScreenId6] = 0; + _vm->_globals._saveData->_data[svLastSavegameSlot] = slot; + _vm->_globals._exitId = _vm->_globals._saveData->_data[svLastScreenId]; + _vm->_globals._saveData->_data[svLastPrevScreenId] = 0; _vm->_globals._screenId = 0; _vm->_objectsManager._mapCarPosX = _vm->_globals._saveData->_mapCarPosX; _vm->_objectsManager._mapCarPosY = _vm->_globals._saveData->_mapCarPosY; diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index c15ba8623e..cb3067bcb1 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -266,8 +266,8 @@ int ScriptManager::handleOpcode(byte *dataP) { case MKTAG24('S', 'T', 'E'): if (!_vm->_objectsManager._disableFl) { _vm->_globals._prevScreenId = _vm->_globals._screenId; - _vm->_globals._saveData->_data[svLastScreenId6] = _vm->_globals._screenId; - _vm->_globals._screenId = _vm->_globals._saveData->_data[svLastScreenId5] = dataP[5]; + _vm->_globals._saveData->_data[svLastPrevScreenId] = _vm->_globals._screenId; + _vm->_globals._screenId = _vm->_globals._saveData->_data[svLastScreenId] = dataP[5]; vbobFrameIndex = dataP[6]; } opcodeType = 1; @@ -279,7 +279,7 @@ int ScriptManager::handleOpcode(byte *dataP) { break; case MKTAG24('P', 'E', 'R'): { int specialOpcode = READ_LE_INT16(dataP + 5); - if (!_vm->_globals._saveData->_data[svField122] && !_vm->_globals._saveData->_data[svField356]) { + if (!_vm->_globals._saveData->_data[svAlternateSpriteFl] && !_vm->_globals._saveData->_data[svField356]) { vbobFrameIndex = 0; switch (specialOpcode) { @@ -935,7 +935,7 @@ int ScriptManager::handleOpcode(byte *dataP) { case 56: _vm->_globals.PERSO = _vm->_fileManager.loadFile("HOPFEM.SPR"); _vm->_globals._characterType = 1; - _vm->_globals._saveData->_data[svField122] = 1; + _vm->_globals._saveData->_data[svAlternateSpriteFl] = 1; _vm->_globals.loadCharacterData(); _vm->_objectsManager._sprite[0].field12 = 28; _vm->_objectsManager._sprite[0].field14 = 155; @@ -945,7 +945,7 @@ int ScriptManager::handleOpcode(byte *dataP) { case 57: _vm->_globals.PERSO = _vm->_fileManager.loadFile("PERSO.SPR"); _vm->_globals._characterType = 0; - _vm->_globals._saveData->_data[svField122] = 0; + _vm->_globals._saveData->_data[svAlternateSpriteFl] = 0; _vm->_globals.loadCharacterData(); _vm->_objectsManager._sprite[0].field12 = 34; _vm->_objectsManager._sprite[0].field14 = 190; @@ -1825,7 +1825,7 @@ int ScriptManager::handleOpcode(byte *dataP) { case 208: { _vm->_globals._disableInventFl = true; - if (_vm->_globals._saveData->_data[svLastScreenId6] != _vm->_globals._saveData->_data[svField401]) { + if (_vm->_globals._saveData->_data[svLastPrevScreenId] != _vm->_globals._saveData->_data[svField401]) { _vm->_soundManager._specialSoundNum = 208; _vm->_animationManager.playSequence("SORT.SEQ", 10, 4, 10, true); _vm->_soundManager._specialSoundNum = 0; @@ -2190,7 +2190,7 @@ int ScriptManager::handleOpcode(byte *dataP) { v51->_pos.y = _vm->_objectsManager.getSpriteY(0); v51->_startSpriteIndex = 57; v51->_location = 97; - _vm->_globals._saveData->_data[svUseless21] = 1; + _vm->_globals._saveData->_data[svHopkinsCloneFl] = 1; _vm->_globals._saveData->_data[svUseless352] = 1; _vm->_globals._saveData->_data[svField353] = 1; _vm->_globals._saveData->_data[svField354] = 1; diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 58fc6ac1e3..ba73d217d7 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -64,8 +64,8 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename) _characterBuffer = _vm->_fileManager.loadFile(filename); _characterSize = _vm->_fileManager.fileSize(filename); } - // CHECKME:_data[svField4] is useless? - _vm->_globals._saveData->_data[svUseless4] = 0; + + _vm->_globals._saveData->_data[svDialogField4] = 0; getStringFromBuffer(40, spriteFilename, (const char *)_characterBuffer); getStringFromBuffer(0, _questionsFilename, (const char *)_characterBuffer); @@ -165,8 +165,7 @@ void TalkManager::startStaticCharacterDialogue(const Common::String &filename) { _characterSize = _vm->_fileManager.fileSize(filename); } - // CHECKME:_data[svField4] is useless? - _vm->_globals._saveData->_data[svUseless4] = 0; + _vm->_globals._saveData->_data[svDialogField4] = 0; getStringFromBuffer(0, _questionsFilename, (const char *)_characterBuffer); getStringFromBuffer(20, _answersFilename, (const char *)_characterBuffer); @@ -348,10 +347,9 @@ int TalkManager::dialogAnswer(int idx, bool animatedFl) { _dialogueMesgId3 = READ_LE_INT16((uint16 *)charBuf + 7); int frameNumb = READ_LE_INT16((uint16 *)charBuf + 8); - // CHECKME:_data[svField4] is useless? int v7 = READ_LE_INT16((uint16 *)charBuf + 9); if (v7) - _vm->_globals._saveData->_data[svUseless4] = v7; + _vm->_globals._saveData->_data[svDialogField4] = v7; if (!frameNumb) frameNumb = 10; -- cgit v1.2.3