diff --git a/engines/simon/saveload.cpp b/engines/simon/saveload.cpp index 7d31c42d7d6..5359c04ba09 100644 --- a/engines/simon/saveload.cpp +++ b/engines/simon/saveload.cpp @@ -449,19 +449,67 @@ void SimonEngine::clearCharacter(WindowBlock *window, int x, byte b) { void SimonEngine::fileError(WindowBlock *window, bool save_error) { HitArea *ha; - const char *string, *string2; + const char *string1, *string2; if (save_error) { - string = "\r Save failed."; - string2 = "\r Disk error."; + switch (_language) { + case Common::PL_POL: + string1 = "\r Blad zapisu. "; + string2 = "\rBlad dysku. "; + break; + case Common::ES_ESP: + string1 = "\r Error al salvar"; + string2 = "\r Intenta con otro disco"; + break; + case Common::IT_ITA: + string1 = "\r Salvataggio non riuscito"; + string2 = "\r Prova un\39altro disco"; + break; + case Common::FR_FRA: + string1 = "\r Echec sauvegarde"; + string2 = "\rEssayez une autre disquette"; + break; + case Common::DE_DEU: + string1 = "\r Sicherung erfolglos."; + string2 = "\rVersuche eine andere Diskette."; + break; + default: + string1 = "\r Save failed."; + string2 = "\r Disk error."; + break; + } } else { - string = "\r Load failed."; - string2 = "\r File not found."; + switch (_language) { + case Common::PL_POL: + string1 = "\r Blad odczytu. "; + string2 = "\r Nie znaleziono pliku."; + break; + case Common::ES_ESP: + string1 = "\r Error al cargar"; + string2 = "\r Archivo no encontrado"; + break; + case Common::IT_ITA: + string1 = "\r Caricamento non riuscito"; + string2 = "\r File non trovato"; + break; + case Common::FR_FRA: + string1 = "\r Echec chargement"; + string2 = "\r Fichier introuvable"; + break; + case Common::DE_DEU: + string1 = "\r Laden erfolglos."; + string2 = "\r Datei nicht gefunden."; + break; + default: + string1 = "\r Load failed."; + string2 = "\r File not found."; + break; + } } windowPutChar(window, 0xC); - for (; *string; string++) - windowPutChar(window, *string); + for (; *string1; string1++) + windowPutChar(window, *string1); for (; *string2; string2++) windowPutChar(window, *string2); @@ -469,13 +517,13 @@ void SimonEngine::fileError(WindowBlock *window, bool save_error) { window->textRow = window->height - 1; window->textLength = 0; - string = "[ OK ]"; - for (; *string; string++) - windowPutChar(window, *string); + string1 = "[ OK ]"; + for (; *string1; string1++) + windowPutChar(window, *string1); ha = findEmptyHitArea(); - ha->x = ((window->width >> 1) + (window->x - 3)) * 8; - ha->y = (window->height << 3) + window->y - 8; + ha->x = ((window->width / 2) + (window->x - 3)) * 8; + ha->y = (window->height * 8) + window->y - 8; ha->width = 48; ha->height = 8; ha->flags = kBFBoxInUse; diff --git a/engines/simon/verb.cpp b/engines/simon/verb.cpp index 75cde7c7ad1..c3c91592068 100644 --- a/engines/simon/verb.cpp +++ b/engines/simon/verb.cpp @@ -34,12 +34,10 @@ static const char *const russian_verb_names[] = { "Qnotrft< pa", "Nt_r[t<", "Ecjdat<", - "Q=fst<", "C^]t<", "Ha_r[t<", "Isqom<^ocat<", - "Docorjt<", "Qp]t<", "Neft<", @@ -51,12 +49,10 @@ static const char *const hebrew_verb_names[] = { "DQZKL RL", "TZG", "DFF", - "@KEL", "DXM", "QBEX", "DYZNY", - "CAX @L", "DQX", "LAY", @@ -68,12 +64,10 @@ static const char *const spanish_verb_names[] = { "Mirar", "Abrir", "Mover", - "Consumir", "Coger", "Cerrar", "Usar", - "Hablar", "Quitar", "Llevar", @@ -85,12 +79,10 @@ static const char *const italian_verb_names[] = { "Osserva", "Apri", "Sposta", - "Mangia", "Raccogli", "Chiudi", "Usa", - "Parla a", "Togli", "Indossa", @@ -102,12 +94,10 @@ static const char *const french_verb_names[] = { "Regarder", "Ouvrir", "D/placer", - "Consommer", "Prendre", "Fermer", "Utiliser", - "Parler ;", "Enlever", "Mettre", @@ -119,12 +109,10 @@ static const char *const german_verb_names[] = { "Schau an", ";ffne", "Bewege", - "Verzehre", "Nimm", "Schlie+e", "Benutze", - "Rede mit", "Entferne", "Trage", @@ -136,12 +124,10 @@ static const char *const english_verb_names[] = { "Look at", "Open", "Move", - "Consume", "Pick up", "Close", "Use", - "Talk to", "Remove", "Wear",