X Tutup
Skip to content
/ scummvm Public

GOB: Fix SaveLoad_v7 initialization #6624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdelamarre merged 1 commit into from
May 19, 2025
Merged

GOB: Fix SaveLoad_v7 initialization #6624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions engines/gob/save/saveload_v7.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,8 +930,10 @@ SaveLoad_v7::SaveFile SaveLoad_v7::_saveFiles[] = {
{"DATA/GIE07_16.pho", kSaveModeSave, nullptr, "app progress" },

{"APPLIS/appli_05.ini", kSaveModeSave, nullptr, "app info" },
{"APPLIS/appli_06.ini", kSaveModeSave, nullptr, "app info" },
{"APPLIS/appli_07.ini", kSaveModeSave, nullptr, "app info" },

// Adi 4 / Addy 4 Base
// Adi 4 / Addy 4 Base
{"config00.inf", kSaveModeSave, nullptr, nullptr },
{"statev00.inf", kSaveModeSave, nullptr, nullptr },
// Adi 4 / Addy 4 Grundschule
Expand Down Expand Up @@ -1367,13 +1369,21 @@ SaveLoad_v7::SaveLoad_v7(GobEngine *vm, const char *targetName) :

for (uint32 i = 0; i < kChildrenCount; i++) {
_saveFiles[index++].handler = _adibou2MemoHandler[i] = new GameFileHandler(_vm, targetName, Common::String::format("memo%02d", i + 1));
_saveFiles[index++].handler = _adibou2DiploHandler[i] = new GameFileHandler(_vm, targetName, Common::String::format("diplo%02d", i + 1));
}

for (uint32 i = 0; i < kChildrenCount; i++) {
_saveFiles[index++].handler = _adibou2DiploHandler[i] = new GameFileHandler(_vm, targetName, Common::String::format("diplo%02d", i + 1));
}

for (uint32 i = 0; i < kAdibou2NbrOfApplications; i++) {
_saveFiles[index++].handler = _adibou2AppliHandler[i] = new GameFileHandler(_vm, targetName, Common::String::format("appli%02d", i + 1));
}

for (uint32 i = 0; i < kAdibou2NbrOfApplications; i++) {
_saveFiles[index++].handler = _adibou2CriteHandler[i] = new GameFileHandler(_vm, targetName, Common::String::format("crite%02d", i + 1));
}

for (uint32 i = 0; i < kAdibou2NbrOfApplications; i++) {
_saveFiles[index++].handler = _adibou2ExoHandler[i] = new GameFileHandler(_vm, targetName, Common::String::format("exo%02d", i + 1));
}

Expand All @@ -1383,14 +1393,17 @@ SaveLoad_v7::SaveLoad_v7(GobEngine *vm, const char *targetName) :

const Common::Array<int> applisOffsets = {0, 4, 8, 12, 16, 20};
_saveFiles[index++].handler = _adibou2ApplicationsInfoHandler = new GameFileHandler(_vm, targetName, "applis");
_saveFiles[index++].handler = _adibou2RetourHandler = new FakeFileHandler(_vm);
_saveFiles[index++].handler = _adibou2LanceHandler = new FakeFileHandler(_vm);
_saveFiles[index++].handler = _adibou2RetourHandler = new FakeFileHandler(_vm);

for (uint32 i = 0; i < kChildrenCount; i++) {
for (uint32 j = 0; j < kAdibou2NbrOfSavedDrawings; j++) {
_saveFiles[index++].handler = _adibou2DrawingHandler[i][j] = new SpriteHandler(_vm,
targetName,
Common::String::format("draw%02d_%02d", i + 1, j + 1));
}

for (uint32 j = 0; j < kAdibou2NbrOfSavedDrawings; j++) {
_saveFiles[index++].handler = _adibou2DrawingThumbnailHandler[i][j] = new SpriteHandler(_vm,
targetName,
Common::String::format("draw_thumbnail_%02d_%02d", i + 1, j + 1));
Expand Down Expand Up @@ -1447,13 +1460,15 @@ SaveLoad_v7::SaveLoad_v7(GobEngine *vm, const char *targetName) :
_saveFiles[index++].handler = _adibou2RelanceHandler = new FakeFileHandler(_vm);
_saveFiles[index++].handler = _adibou2MemHandler = new FakeFileHandler(_vm);

for (uint32 i = 4; i < kAdibou2NbrOfApplications; i++) {
for (uint32 j = 0; j < kChildrenCount; j++) {
for (uint32 j = 0; j < kChildrenCount; j++) {
for (uint32 i = 4; i < kAdibou2NbrOfApplications; i++) {
_saveFiles[index++].handler = _adibou2AppProgressExtHandler[i - 4][j] = new GameFileHandler(_vm,
targetName,
Common::String::format("gie_%02d_%02d_pho", i + 1, j + 1));
}
}

for (uint32 i = 4; i < kAdibou2NbrOfApplications; i++) {
_saveFiles[index++].handler = _adibou2AppliIniHandler[i - 4] = new GameFileHandler(_vm,
targetName,
Common::String::format("appli_%02d_ini", i + 1));
Expand Down
Loading
X Tutup