[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.157,2.158

Max Horn fingolfin at users.sourceforge.net
Mon Jul 21 18:15:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16283

Modified Files:
	script_v2.cpp 
Log Message:
fix spanish prepositions, see bug #772277. And BTW, does anybody know when and where the 'on/mit/sur/su/en' preposition is actually used?

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -d -r2.157 -r2.158
--- script_v2.cpp	19 Jul 2003 16:10:15 -0000	2.157
+++ script_v2.cpp	22 Jul 2003 01:14:09 -0000	2.158
@@ -951,9 +951,9 @@
 	}
 
 	if (0 < VAR(VAR_SENTENCE_PREPOSITION) && VAR(VAR_SENTENCE_PREPOSITION) <= 4) {
-		// FIXME: Are these stored somewhere in the data? If not, we have to provide
-		// localized versions for all the languages MM/Zak are available in. Note
-		// that we already will have to do that for the fonts anyway.
+		// The prepositions, like the fonts, were hard code in the engine. Thus
+		// we have to do that, too, and provde localized versions for all the
+		// languages MM/Zak are available in.
 		//
 		// The order here matches the one defined in gameDetector.h
 		const char *prepositions[][5] = {
@@ -962,12 +962,12 @@
 			{ " ", " dans", " avec", " sur", " <" },	// French
 			{ " ", " in", " con", " su", " a" },	// Italian
 			{ " ", " in", " with", " on", " to" },	// Portugese
-			{ " ", " an", " con", " on", " a" },	// Spanish
+			{ " ", " en", " con", " en", " a" },	// Spanish
 			{ " ", " in", " with", " on", " to" },	// Japanese
 			{ " ", " in", " with", " on", " to" },	// Chinese
 			{ " ", " in", " with", " on", " to" }	// Korean
 			};
-		int lang = (_language <= 8) ? _language : 0;
+		int lang = (_language <= 8) ? _language : 0;	// Default to english
 		strcat(sentence, prepositions[lang][VAR(VAR_SENTENCE_PREPOSITION)]);
 	}
 





More information about the Scummvm-git-logs mailing list