[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.307,1.308 simon.h,1.90,1.91 verb.cpp,1.21,1.22

[Travis Howell]

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

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

Fix display of verb name text when verb is selected in Simon the Sorcerer 1 and enable for all versions of the game.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- simon.cpp	5 Oct 2003 14:37:16 -0000	1.307
+++ simon.cpp	8 Oct 2003 07:38:46 -0000	1.308
@@ -284,7 +284,6 @@
 	_video_var_8 = 0;
 	_use_palette_delay = 0;
 	_sync_flag_2 = 0;
-	_hitarea_unk_6 = 0;
 	_in_callback = 0;
 	_cepe_flag = 0;
 	_copy_partial_mode = 0;
@@ -1379,7 +1378,6 @@
 
 	_last_hitarea = 0;
 	_hitarea_object_item = NULL;
-	_hitarea_unk_6 = true;
 
 	last = _last_hitarea_2_ptr;
 	defocusHitarea();
@@ -1415,7 +1413,6 @@
 	_last_hitarea_3 = 0;
 	_last_hitarea = 0;
 	_last_hitarea_2_ptr = NULL;
-	_hitarea_unk_6 = false;
 }
 
 void SimonEngine::startSubroutine170() {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- simon.h	4 Oct 2003 11:50:21 -0000	1.90
+++ simon.h	8 Oct 2003 07:38:48 -0000	1.91
@@ -174,7 +174,6 @@
 	byte _video_var_8;
 	bool _use_palette_delay;
 	bool _sync_flag_2;
-	bool _hitarea_unk_6;
 	bool _in_callback;
 	bool _cepe_flag;
 	byte _copy_partial_mode;

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- verb.cpp	3 Oct 2003 19:42:27 -0000	1.21
+++ verb.cpp	8 Oct 2003 07:38:48 -0000	1.22
@@ -26,7 +26,92 @@
 
 namespace Simon {
 
-static const char *const verb_names[] = {
+static const char *const hebrew_verb_names[] = {
+	"LJ @L",
+	"DQZKL RL",
+	"TZG",
+	"DFF",
+
+	"@KEL",
+	"DXM",
+	"QBEX",
+	"DYZNY",
+
+	"CAX @L",
+	"DQX",
+	"LAY",
+	"ZO"
+};
+
+static const char *const spanish_verb_names[] = {
+	"Caminar",
+	"Mirar",
+	"Abrir",
+	"Mover",
+
+	"Consumir",
+	"Coger",
+	"Cerrar",
+	"Usar",
+
+	"Hablar",
+	"Quitar",
+	"Llevar",
+	"Dar"
+};
+
+static const char *const italian_verb_names[] = {
+	"Vai verso",
+	"Osserva",
+	"Apri",
+	"Sposta",
+
+	"Mangia",
+	"Raccogli",
+	"Chiudi",
+	"Usa",
+
+	"Parla a",
+	"Togli",
+	"Indossa",
+	"Dai"
+};
+
+static const char *const french_verb_names[] = {
+	"Aller vers",
+	"Regarder",
+	"Ouvrir",
+	"D/placer",
+
+	"Consommer",
+	"Prendre",
+	"Fermer",
+	"Utiliser",
+
+	"Parler ;",
+	"Enlever",
+	"Mettre",
+	"Donner"
+};
+
+static const char *const german_verb_names[] = {
+	"Gehe zu",
+	"Schau an",
+	";ffne",
+	"Bewege",
+
+	"Verzehre",
+	"Nimm",
+	"Schlie+e",
+	"Benutze",
+
+	"Rede mit",
+	"Entferne",
+	"Trage",
+	"Gib"
+};
+
+static const char *const english_verb_names[] = {
 	"Walk to",
 	"Look at",
 	"Open",
@@ -99,14 +184,14 @@
 	hitareaChangedHelper();
 	_hitarea_ptr_7 = last;
 
-	if (last != NULL && _hitarea_unk_6 &&
-			(ha = findHitAreaByID(200)) && (ha->flags & 0x40) && !(last->flags & 0x40))
+	if (last != NULL && (ha = findHitAreaByID(200)) && (ha->flags & 0x40) && !(last->flags & 0x40))
 		focusVerb(last->id);
 }
 
 void SimonEngine::focusVerb(uint hitarea_id) {
 	uint x;
 	const char *txt;
+	const char * const *verb_names;
 	const char * const *verb_prep_names;
 
 	hitarea_id -= 101;
@@ -123,7 +208,15 @@
 		CHECK_BOUNDS(hitarea_id, english_verb_prep_names);
 		txt = verb_prep_names[hitarea_id];
 	} else {
-		CHECK_BOUNDS(hitarea_id, verb_names);
+		switch (_language) {
+		case 20: verb_names = hebrew_verb_names; break;
+		case  5: verb_names = spanish_verb_names; break;
+		case  3: verb_names = italian_verb_names; break;
+		case  2: verb_names = french_verb_names; break;
+		case  1: verb_names = german_verb_names; break;
+		default: verb_names = english_verb_names; break;
+		}
+		CHECK_BOUNDS(hitarea_id, english_verb_names);
 		txt = verb_names[hitarea_id];
 	}
 	x = (53 - strlen(txt)) * 3;