[Scummvm-cvs-logs] CVS: scummvm/simon verb.cpp,1.10,1.11

[Max Horn]

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

Modified Files:
	verb.cpp 
Log Message:
fixed a copy&paste bug; rewrote the code in question to streamline it a bit

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- verb.cpp	5 Feb 2003 09:29:37 -0000	1.10
+++ verb.cpp	5 Feb 2003 19:21:23 -0000	1.11
@@ -107,37 +107,21 @@
 {
 	uint x;
 	const char *txt;
+	const char * const *verb_prep_names;
 
 	hitarea_id -= 101;
 
-	if (_language == 20) {
-		CHECK_BOUNDS(hitarea_id, hebrew_verb_prep_names);
-	} else if (_language == 5) {
-		CHECK_BOUNDS(hitarea_id, spanish_verb_prep_names);
-	} else 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) {
-		if (_language == 20) {
-		CHECK_BOUNDS(hitarea_id, hebrew_verb_prep_names);
-		} else if (_language == 5) {
-			txt = spanish_verb_prep_names[hitarea_id];
-		} else 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];
+		switch (_language) {
+		case 20: verb_prep_names = hebrew_verb_prep_names; break;
+		case  5: verb_prep_names = spanish_verb_prep_names; break;
+		case  3: verb_prep_names = italian_verb_prep_names; break;
+		case  2: verb_prep_names = french_verb_prep_names; break;
+		case  1: verb_prep_names = german_verb_prep_names; break;
+		default: verb_prep_names = english_verb_prep_names; break;
 		}
+		CHECK_BOUNDS(hitarea_id, verb_prep_names);
+		txt = english_verb_prep_names[hitarea_id];
 	} else {
 		txt = verb_names[hitarea_id];
 	}