thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KYRA: Fix bug #3437647 "LOL: Unexpected missing save file".

Browse source 
Formerly the code was confused about what _saveSlots is doing, i.e. creating a
continous list of existing save slot ids.
(cherry picked from commit f410480cfd)
This commit is contained in:
Johannes Schickel 2011-11-14 15:39:59 +01:00 • committed by Willem Jan Palenstijn
parent 1dfe45b672
commit 7bae4b95d3
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/kyra/gui_lol.cpp
View file

@ -2575,8 +2575,8 @@ void GUI_LoL::setupSaveMenuSlots(Menu &menu, int num) {
int saveSlotMaxLen = ((_screen->getScreenDim(8))->w << 3) - _screen->getCharWidth('W'); int saveSlotMaxLen = ((_screen->getScreenDim(8))->w << 3) - _screen->getCharWidth('W');
for (int i = startSlot; i < num && _savegameOffset + i - slotOffs < _savegameListSize; ++i) { for (int i = startSlot; i < num && _savegameOffset + i - slotOffs < _savegameListSize; ++i) {
if (_savegameList[_saveSlots[i + _savegameOffset - slotOffs]]) { if (_savegameList[i + _savegameOffset - slotOffs]) {
Common::strlcpy(s, _savegameList[_saveSlots[i + _savegameOffset - slotOffs]], 80); Common::strlcpy(s, _savegameList[i + _savegameOffset - slotOffs], 80);
// Trim long GMM save descriptions to fit our save slots // Trim long GMM save descriptions to fit our save slots
int fC = _screen->getTextWidth(s); int fC = _screen->getTextWidth(s);
@ -2626,7 +2626,7 @@ void GUI_LoL::updateSavegameList() {
_savegameList = new char *[_savegameListSize]; _savegameList = new char *[_savegameListSize];
for (int i = 0; i < _savegameListSize; i++) { for (int i = 0; i < _savegameListSize; i++) {
in = _vm->openSaveForReading(_vm->getSavegameFilename(i), header); in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i]), header);
if (in) { if (in) {
_savegameList[i] = new char[header.description.size() + 1]; _savegameList[i] = new char[header.description.size() + 1];
Common::strlcpy(_savegameList[i], header.description.c_str(), header.description.size() + 1); Common::strlcpy(_savegameList[i], header.description.c_str(), header.description.size() + 1);
@ -2634,10 +2634,9 @@ void GUI_LoL::updateSavegameList() {
delete in; delete in;
} else { } else {
_savegameList[i] = 0; _savegameList[i] = 0;
error("GUI_LoL::updateSavegameList(): Unexpected missing save file for slot: %d.", i); error("GUI_LoL::updateSavegameList(): Unexpected missing save file for slot: %d.", _saveSlots[i]);
} }
} }
} else { } else {
_savegameList = 0; _savegameList = 0;
} }