diff options
| author | Florian Kagerer | 2009-09-06 17:04:58 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-09-06 17:04:58 +0000 |
| commit | 25429b660532c0ee787374df138c15bfeee780c9 (patch) | |
| tree | 5231c1e36eddfdc35de303eef657bea12b4fed75 /engines/kyra | |
| parent | 9da3c5c7169fc8d3772917238a8c79d8f0ceea4b (diff) | |
| download | scummvm-rg350-25429b660532c0ee787374df138c15bfeee780c9.tar.gz scummvm-rg350-25429b660532c0ee787374df138c15bfeee780c9.tar.bz2 scummvm-rg350-25429b660532c0ee787374df138c15bfeee780c9.zip | |
LOL: fixed bug in delete menu code
svn-id: r43991
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/gui.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/gui_lol.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index e49085103a..e2bf8091f3 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -385,7 +385,9 @@ void GUI::updateSaveList(bool excludeQuickSaves) { int GUI::getNextSavegameSlot() { Common::InSaveFile *in; - for (int i = 1; i < 990; i++) { + int start = _vm->gameFlags().gameID == GI_LOL ? 0 : 1; + + for (int i = start; i < 990; i++) { if ((in = _vm->_saveFileMan->openForLoading(_vm->getSavegameFilename(i)))) delete in; else diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index 55026c9023..af182b02ac 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -2662,7 +2662,7 @@ int GUI_LoL::clickedSaveMenu(Button *button) { _newMenu = &_savenameMenu; int16 s = (int16)button->arg; - _menuResult = _saveMenu.item[-s - 2].saveSlot; + _menuResult = _saveMenu.item[-s - 2].saveSlot + 1; _saveDescription = (char*)_vm->_tempBuffer5120 + 1000; _saveDescription[0] = 0; if (_saveMenu.item[-s - 2].saveSlot != -3) @@ -2682,7 +2682,7 @@ int GUI_LoL::clickedDeleteMenu(Button *button) { _choiceMenu.menuNameId = 0x400b; _newMenu = &_choiceMenu; int16 s = (int16)button->arg; - _menuResult = _deleteMenu.item[-s - 2].saveSlot; + _menuResult = _deleteMenu.item[-s - 2].saveSlot + 1; return 1; } @@ -2817,7 +2817,7 @@ int GUI_LoL::clickedSavenameMenu(Button *button) { Util::convertDOSToISO(_saveDescription); - int slot = _menuResult == -3 ? getNextSavegameSlot() : _menuResult; + int slot = _menuResult == -2 ? getNextSavegameSlot() : _menuResult - 1; Graphics::Surface thumb; createScreenThumbnail(thumb); _vm->saveGameState(slot, _saveDescription, &thumb); @@ -2838,15 +2838,13 @@ int GUI_LoL::clickedChoiceMenu(Button *button) { if (_lastMenu == &_mainMenu) { _vm->quitGame(); } else if (_lastMenu == &_deleteMenu) { - _vm->_saveFileMan->removeSavefile(_vm->getSavegameFilename(_menuResult)); - Common::Array<int>::iterator i = Common::find(_saveSlots.begin(), _saveSlots.end(), _menuResult); - while (i != _saveSlots.end()) { - ++i; - if (i == _saveSlots.end()) - break; + _vm->_saveFileMan->removeSavefile(_vm->getSavegameFilename(_menuResult - 1)); + Common::Array<int>::iterator i = Common::find(_saveSlots.begin(), _saveSlots.end(), _menuResult - 1); + while (i != _saveSlots.begin()) { + --i; // We are only renaming all savefiles until we get some slots missing // Also not rename quicksave slot filenames - if (*(i-1) != *i || *i >= 990) + if (/**(i-1) != *i ||*/ *i >= 990) break; Common::String oldName = _vm->getSavegameFilename(*i); Common::String newName = _vm->getSavegameFilename(*i-1); |