[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.123,2.124

[Max Horn]

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

Modified Files:
	script_v2.cpp 
Log Message:
preparations for multi-language V2 supports

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.123
retrieving revision 2.124
diff -u -d -r2.123 -r2.124
--- script_v2.cpp	24 May 2003 17:18:23 -0000	2.123
+++ script_v2.cpp	25 May 2003 18:56:20 -0000	2.124
@@ -934,12 +934,24 @@
 		}
 	}
 
-	if (0 < _scummVars[29] && _scummVars[29] <= 4) {
+	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.
-		const char *words[] = { " ", " in", " with", " on", " to" };
-		strcat(sentence, words[_scummVars[29]]);
+		//
+		// The order here matches the one defined in gameDetector.h
+		const char *prepositions[][5] = {
+			{ " ", " in", " with", " on", " to" },	// English
+			{ " ", " mit", " mit", " mit", " zu" },	// German
+			{ " ", " dans", " avec", " sur", " <" },	// French
+			{ " ", " in", " with", " on", " to" },	// Italian
+			{ " ", " in", " with", " on", " to" },	// Portugese
+			{ " ", " in", " with", " on", " to" },	// Spanish
+			{ " ", " in", " with", " on", " to" },	// Japanese
+			{ " ", " in", " with", " on", " to" },	// Chinese
+			{ " ", " in", " with", " on", " to" }	// Korean
+			};
+		strcat(sentence, prepositions[0][VAR(VAR_SENTENCE_PREPOSITION)]);
 	}
 
 	if (VAR(VAR_SENTENCE_OBJECT2) > 0) {