- fixed savegame description loading in kyra1

- added Kyra2 load menu, currently just accessable from startup menu though

svn-id: r31331

1 files changed, 5 insertions, 5 deletions

diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp
index c39d889741..c86521a625 100644
--- a/engines/kyra/gui_v1.cpp
+++ b/engines/kyra/gui_v1.cpp
@@ -625,10 +625,10 @@ void GUI_v1::setupSavegames(Menu &menu, int num) {
 		startSlot = 0;
 	}
 
+	KyraEngine::SaveHeader header;
 	for (int i = startSlot; i < num; i++) {
-		if ((in = _vm->_saveFileMan->openForLoading(_vm->getSavegameFilename(i + _savegameOffset)))) {
-			in->skip(8);
-			in->read(savenames[i], 31);
+		if ((in = _vm->openSaveForReading(_vm->getSavegameFilename(i + _savegameOffset), header))) {
+			strncpy(savenames[i], header.description.c_str(), 31);
 			menu.item[i].itemString = savenames[i];
 			menu.item[i].enabled = 1;
 			menu.item[i].saveSlot = i + _savegameOffset;
@@ -772,7 +772,7 @@ void GUI_v1::updateSavegameString() {
 int GUI_v1::saveGame(Button *button) {
 	debugC(9, kDebugLevelGUI, "GUI_v1::saveGame()");
 	updateMenuButton(button);
-	_vm->_gameToLoad = button->index;
+	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
 
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -830,7 +830,7 @@ int GUI_v1::loadGame(Button *button) {
 	debugC(9, kDebugLevelGUI, "GUI_v1::loadGame()");
 	updateMenuButton(button);
 	_displaySubMenu = false;
-	_vm->_gameToLoad = button->index;
+	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
 
 	return 0;
 }