[Scummvm-cvs-logs] SF.net SVN: scummvm:[34502] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 34502
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34502&view=rev
Author:   lordhoto
Date:     2008-09-12 12:25:56 +0000 (Fri, 12 Sep 2008)

Log Message:
-----------
Fixed slot 0 savefile name in Kyra3. (Now using 'New game' instead of 'German')

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/detection.cpp
    scummvm/trunk/engines/kyra/kyra_mr.cpp

Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp	2008-09-12 01:28:28 UTC (rev 34501)
+++ scummvm/trunk/engines/kyra/detection.cpp	2008-09-12 12:25:56 UTC (rev 34502)
@@ -1138,8 +1138,13 @@
 		if (slotNum >= 0 && slotNum <= 999) {
 			Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str());
 			if (in) {
-				if (Kyra::KyraEngine_v1::readSaveHeader(in, false, header) == Kyra::KyraEngine_v1::kRSHENoError)
+				if (Kyra::KyraEngine_v1::readSaveHeader(in, false, header) == Kyra::KyraEngine_v1::kRSHENoError) {
+					// Workaround for old savegames using 'German' as description for kyra3 start savegame (slot 0)
+					if (slotNum == 0 && header.gameID == Kyra::GI_KYRA3)
+						header.description = "New Game";
+
 					saveList.push_back(SaveStateDescriptor(slotNum, header.description, *file));
+				}
 				delete in;
 			}
 		}

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2008-09-12 01:28:28 UTC (rev 34501)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2008-09-12 12:25:56 UTC (rev 34502)
@@ -684,7 +684,7 @@
 	assert(_invWsa);
 	_invWsa->open("MOODOMTR.WSA", 1, 0);
 	_invWsaFrame = 6;
-	saveGame(getSavegameFilename(0), (const char*)getTableEntry(_optionsFile, 33), 0);
+	saveGame(getSavegameFilename(0), "New Game", 0);
 	_soundDigital->beginFadeOut(_musicSoundChannel, 60);
 	delayWithTicks(60);
 	if (_gameToLoad == -1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.