[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.144,1.145 simon.h,1.46,1.47 verb.cpp,1.8,1.9

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv30807/simon

Modified Files:
	simon.cpp simon.h verb.cpp 
Log Message:

Add improved support for french, german and italian


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- simon.cpp	19 Jan 2003 15:39:54 -0000	1.144
+++ simon.cpp	29 Jan 2003 10:08:54 -0000	1.145
@@ -177,6 +177,7 @@
 
 	_debugMode = detector->_debugMode;
 	_debugLevel = detector->_debugLevel;
+ 	_language = detector->_language;
 
 	_effects_paused = false;
 	_ambient_paused = false;

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- simon.h	19 Jan 2003 15:39:54 -0000	1.46
+++ simon.h	29 Jan 2003 10:08:56 -0000	1.47
@@ -181,6 +181,7 @@
 	bool _mouse_pos_changed;
 	uint16 _debugMode;
 	uint16 _debugLevel;
+	uint16 _language;
 	bool _start_mainscript;
 	bool _continous_mainscript;
 	bool _continous_vgascript;

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- verb.cpp	5 Nov 2002 05:41:52 -0000	1.8
+++ verb.cpp	29 Jan 2003 10:08:56 -0000	1.9
@@ -41,13 +41,30 @@
 	"Give"
 };
 
-static const char *const verb_prep_names[] = {
+static const char *const italian_verb_prep_names[] = {
+	"", "", "", "",
+	"", "", "", "con che cosa ?",
+	"", "", "", "a chi ?"
+};
+
+static const char *const french_verb_prep_names[] = {
+	"", "", "", "",
+	"", "", "", "avec quoi ?",
+	"", "", "", "; qui ?"
+};
+
+static const char *const german_verb_prep_names[] = {
+	"", "", "", "",
+	"", "", "", "mit was ?",
+	"", "", "", "zu wem ?"
+};
+
+static const char *const english_verb_prep_names[] = {
 	"", "", "", "",
 	"", "", "", "with what ?",
 	"", "", "", "to whom ?"
 };
 
-
 void SimonState::defocusHitarea()
 {
 	HitArea *last;
@@ -81,10 +98,26 @@
 
 	hitarea_id -= 101;
 
-	CHECK_BOUNDS(hitarea_id, verb_prep_names);
+	if (_language == 3) {
+		CHECK_BOUNDS(hitarea_id, italian_verb_prep_names);
+	} else if (_language == 2) {
+		CHECK_BOUNDS(hitarea_id, french_verb_prep_names);
+	} else if (_language == 1) {
+		CHECK_BOUNDS(hitarea_id, german_verb_prep_names);
+	} else {
+		CHECK_BOUNDS(hitarea_id, english_verb_prep_names);
+	}
 
 	if (_show_preposition) {
-		txt = verb_prep_names[hitarea_id];
+		if (_language == 3) {
+			txt = italian_verb_prep_names[hitarea_id];
+		} else if (_language == 2) {
+			txt = french_verb_prep_names[hitarea_id];
+		} else if (_language == 1) {
+			txt = german_verb_prep_names[hitarea_id];
+		} else {
+			txt = english_verb_prep_names[hitarea_id];
+		}
 	} else {
 		txt = verb_names[hitarea_id];
 	}