[Scummvm-cvs-logs] CVS: scummvm/saga itedata.cpp,1.6,1.7 itedata.h,1.5,1.6 saveload.cpp,1.21,1.22

Eugene Sandulenko sev at users.sourceforge.net
Thu Aug 11 07:05:09 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30389

Modified Files:
	itedata.cpp itedata.h saveload.cpp 
Log Message:
Fix bug #1256704 "ITE: Wrong text display in German version"


Index: itedata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- itedata.cpp	8 Aug 2005 08:15:15 -0000	1.6
+++ itedata.cpp	11 Aug 2005 14:03:10 -0000	1.7
@@ -334,7 +334,7 @@
 	{ FX_CROWD_17,      64 }
 };
 
-const char *ITEinterfaceTextStrings[][44] = {
+const char *ITEinterfaceTextStrings[][45] = {
 	{
 		"Walk to", "Look At", "Pick Up", "Talk to", "Open",
 		"Close", "Use", "Give", "Options", "Test",
@@ -344,7 +344,8 @@
 		"Quit", "OK", "Mid", "Click", "10%",
 		"20%", "30%", "40%", "50%", "60%",
 		"70%", "80%", "90%", "Max", "Quit the Game?",
-		"Load Successful!", "Enter Save Game Name", "Give %s to %s", "Use %s with %s"
+		"Load Successful!", "Enter Save Game Name", "Give %s to %s", "Use %s with %s",
+		"[New Save Game]"
 		
 	},
 	// German
@@ -357,7 +358,8 @@
 		"Beenden", NULL, "M", "Klick", NULL,
 		NULL, NULL, NULL, NULL, NULL,
 		NULL, NULL, NULL, NULL, "Spiel beenden?",
-		"Spielstand geladen!", "Bitte Namen eingeben", "Gib %s zu %s", "Benutze %s mit %s"
+		"Spielstand geladen!", "Bitte Namen eingeben", "Gib %s zu %s", "Benutze %s mit %s",
+		"[Neuer Spielstand]"
 	}
 };
 

Index: itedata.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- itedata.h	8 Aug 2005 08:15:15 -0000	1.5
+++ itedata.h	11 Aug 2005 14:03:10 -0000	1.6
@@ -87,7 +87,7 @@
 extern ObjectTableData ITE_ObjectTable[ITE_OBJECTCOUNT];
 extern FxTable ITE_SfxTable[ITE_SFXCOUNT];
 
-extern const char *ITEinterfaceTextStrings[][44];
+extern const char *ITEinterfaceTextStrings[][45];
 
 } // End of namespace Saga
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saveload.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- saveload.cpp	29 Jul 2005 17:57:59 -0000	1.21
+++ saveload.cpp	11 Aug 2005 14:03:10 -0000	1.22
@@ -43,7 +43,7 @@
 namespace Saga {
 
 static SaveFileData emptySlot = {
-	 "[New Save Game]", 0
+	 "", 0
 };
 
 //TODO:
@@ -62,6 +62,9 @@
 	if (isSaveListFull()) {
 		return &_saveFiles[_saveFilesCount - idx - 1];
 	} else {
+		if (!emptySlot.name[0])
+			strcpy(emptySlot.name, getTextString(44));
+
 		return (idx == 0) ? &emptySlot : &_saveFiles[_saveFilesCount - idx];
 	}
 }





More information about the Scummvm-git-logs mailing list