[Scummvm-git-logs] scummvm master -> 9eecd41b6e4cc3a82ccf38568223276323ad4f36

dreammaster dreammaster at scummvm.org
Sun Apr 11 23:33:23 UTC 2021


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b6ac34f16f TSAGE: Continue button for Ringworld Pause dialog
ed75e254c1 TSAGE: Spanish strings mini-cleanup
9eecd41b6e TSAGE: Spanish BlueForce: two different Restart buttons


Commit: b6ac34f16fb7f70d802d12d09dd0e0f48224271a
    https://github.com/scummvm/scummvm/commit/b6ac34f16fb7f70d802d12d09dd0e0f48224271a
Author: Francisco Javier Diéguez Tirado (javi.dieguez at gmail.com)
Date: 2021-04-11T16:33:19-07:00

Commit Message:
TSAGE: Continue button for Ringworld Pause dialog

The pause dialog in Ringworld is exited with "Continue" instead of "OK".
This happens in both the original English and Spanish versions.

Changed paths:
    engines/tsage/ringworld/ringworld_logic.cpp
    engines/tsage/staticres.cpp
    engines/tsage/staticres.h


diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index c4faf0766b..4e17a6f3af 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -597,9 +597,9 @@ void RingworldGame::processEvent(Event &event) {
 			// F10 - Pause
 			GfxDialog::setPalette();
 			if (g_vm->getLanguage() == Common::ES_ESP) {
-				MessageDialog::show(ESP_RW_GAME_PAUSED_MSG, ESP_OK_BTN_2_STRING);
+				MessageDialog::show(ESP_RW_GAME_PAUSED_MSG, ESP_CONTINUE_BTN_STRING);
 			} else {
-				MessageDialog::show(GAME_PAUSED_MSG, OK_BTN_STRING);
+				MessageDialog::show(GAME_PAUSED_MSG, CONTINUE_BTN_STRING);
 			}
 			g_globals->_events.setCursorFromFlag();
 			break;
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 23221a8731..d8e70c2718 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -78,6 +78,7 @@ char const *const QUIT_CONFIRM_MSG = "Do you want to quit playing this game?";
 char const *const RESTART_MSG = "Do you want to restart this game?";
 char const *const GAME_PAUSED_MSG = "Game is paused.";
 char const *const OK_BTN_STRING = " Ok ";
+char const *const CONTINUE_BTN_STRING = " Continue ";
 char const *const CANCEL_BTN_STRING = "Cancel";
 char const *const QUIT_BTN_STRING = " Quit ";
 char const *const RESTART_BTN_STRING = "Restart";
@@ -107,7 +108,7 @@ char const *const ESP_BF_RESTART_MSG = "\250Quieres volver a comenzar el juego?"
 char const *const ESP_RW_GAME_PAUSED_MSG = "Juego pausado";
 char const *const ESP_BF_GAME_PAUSED_MSG = "Juego en pausa.";
 char const *const ESP_OK_BTN_STRING = " Ok ";
-char const *const ESP_OK_BTN_2_STRING = " Continuar ";
+char const *const ESP_CONTINUE_BTN_STRING = " Continuar ";
 char const *const ESP_CANCEL_BTN_STRING = "Cancelar";
 char const *const ESP_RW_QUIT_BTN_STRING = " Abandonar ";
 char const *const ESP_BF_QUIT_BTN_STRING = " Salir ";
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 92844b6065..9544ec0491 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -45,6 +45,7 @@ extern char const *const QUIT_CONFIRM_MSG;
 extern char const *const RESTART_MSG;
 extern char const *const GAME_PAUSED_MSG;
 extern char const *const OK_BTN_STRING;
+extern char const *const CONTINUE_BTN_STRING;
 extern char const *const CANCEL_BTN_STRING;
 extern char const *const QUIT_BTN_STRING;
 extern char const *const RESTART_BTN_STRING;
@@ -76,7 +77,7 @@ extern char const *const ESP_BF_RESTART_MSG;
 extern char const *const ESP_RW_GAME_PAUSED_MSG;
 extern char const *const ESP_BF_GAME_PAUSED_MSG;
 extern char const *const ESP_OK_BTN_STRING;
-extern char const *const ESP_OK_BTN_2_STRING;
+extern char const *const ESP_CONTINUE_BTN_STRING;
 extern char const *const ESP_CANCEL_BTN_STRING;
 extern char const *const ESP_RW_QUIT_BTN_STRING;
 extern char const *const ESP_BF_QUIT_BTN_STRING;


Commit: ed75e254c1bb7aff6024c04ce4f3601d09f6056a
    https://github.com/scummvm/scummvm/commit/ed75e254c1bb7aff6024c04ce4f3601d09f6056a
Author: Francisco Javier Diéguez Tirado (javi.dieguez at gmail.com)
Date: 2021-04-11T16:33:19-07:00

Commit Message:
TSAGE: Spanish strings mini-cleanup

BF/RW specific strings renamed and moved to the corresponding namespaces

Changed paths:
    engines/tsage/blue_force/blueforce_dialogs.cpp
    engines/tsage/blue_force/blueforce_logic.cpp
    engines/tsage/ringworld/ringworld_dialogs.cpp
    engines/tsage/ringworld/ringworld_logic.cpp
    engines/tsage/scenes.cpp
    engines/tsage/staticres.cpp
    engines/tsage/staticres.h


diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index b971868d76..237341b70a 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -467,7 +467,7 @@ void OptionsDialog::show() {
 		// Quit game
 		int rc;
 		if (g_vm->getLanguage() == Common::ES_ESP) {
-			rc = MessageDialog::show(ESP_BF_QUIT_CONFIRM_MSG, ESP_CANCEL_BTN_STRING, ESP_BF_QUIT_BTN_STRING);
+			rc = MessageDialog::show(ESP_QUIT_CONFIRM_MSG, ESP_CANCEL_BTN_STRING, ESP_QUIT_BTN_STRING);
 		} else {
 			rc = MessageDialog::show(QUIT_CONFIRM_MSG, CANCEL_BTN_STRING, QUIT_BTN_STRING);
 		}
@@ -485,11 +485,11 @@ OptionsDialog::OptionsDialog() {
 	if (g_vm->getLanguage() == Common::ES_ESP) {
 		_gfxMessage.set(ESP_OPTIONS_MSG, 140, ALIGN_LEFT);
 		_btnRestore.setText(ESP_RESTORE_BTN_STRING);
-		_btnSave.setText(ESP_BF_SAVE_BTN_STRING);
-		_btnRestart.setText(ESP_BF_RESTART_BTN_STRING);
-		_btnQuit.setText(ESP_BF_QUIT_BTN_STRING);
+		_btnSave.setText(ESP_SAVE_BTN_STRING);
+		_btnRestart.setText(ESP_RESTART_BTN_STRING);
+		_btnQuit.setText(ESP_QUIT_BTN_STRING);
 		_btnSound.setText(ESP_SOUND_BTN_STRING);
-		_btnResume.setText(ESP_BF_RESUME_BTN_STRING);
+		_btnResume.setText(ESP_RESUME_BTN_STRING);
 	} else {
 		_gfxMessage.set(OPTIONS_MSG, 140, ALIGN_LEFT);
 		_btnRestore.setText(RESTORE_BTN_STRING);
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 103dcee952..d3a13d8c62 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -330,7 +330,7 @@ void BlueForceGame::processEvent(Event &event) {
 			// F10 - Pause
 			GfxDialog::setPalette();
 			if (g_vm->getLanguage() == Common::ES_ESP) {
-				MessageDialog::show(ESP_BF_GAME_PAUSED_MSG, ESP_OK_BTN_STRING);
+				MessageDialog::show(ESP_GAME_PAUSED_MSG, ESP_OK_BTN_STRING);
 			} else {
 				MessageDialog::show(GAME_PAUSED_MSG, OK_BTN_STRING);
 			}
diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp
index 2431c4e34c..afb600fd1c 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.cpp
+++ b/engines/tsage/ringworld/ringworld_dialogs.cpp
@@ -226,7 +226,7 @@ void OptionsDialog::show() {
 		// Quit game
 		int rc;
 		if (g_vm->getLanguage() == Common::ES_ESP) {
-			rc = MessageDialog::show(ESP_RW_QUIT_CONFIRM_1_MSG, ESP_CANCEL_BTN_STRING, ESP_RW_QUIT_BTN_STRING);
+			rc = MessageDialog::show(ESP_QUIT_CONFIRM_1_MSG, ESP_CANCEL_BTN_STRING, ESP_QUIT_BTN_STRING);
 		} else {
 			rc = MessageDialog::show(QUIT_CONFIRM_MSG, CANCEL_BTN_STRING, QUIT_BTN_STRING);
 		}
@@ -256,11 +256,11 @@ OptionsDialog::OptionsDialog() {
 	if (g_vm->getLanguage() == Common::ES_ESP) {
 		_gfxMessage.set(ESP_OPTIONS_MSG, 140, ALIGN_LEFT);
 		_btnRestore.setText(ESP_RESTORE_BTN_STRING);
-		_btnSave.setText(ESP_RW_SAVE_BTN_STRING);
-		_btnRestart.setText(ESP_RW_RESTART_BTN_1_STRING);
-		_btnQuit.setText(ESP_RW_QUIT_BTN_STRING);
+		_btnSave.setText(ESP_SAVE_BTN_STRING);
+		_btnRestart.setText(ESP_RESTART_BTN_1_STRING);
+		_btnQuit.setText(ESP_QUIT_BTN_STRING);
 		_btnSound.setText(ESP_SOUND_BTN_STRING);
-		_btnResume.setText(ESP_RW_RESUME_BTN_STRING);
+		_btnResume.setText(ESP_RESUME_BTN_STRING);
 	} else {
 		_gfxMessage.set(OPTIONS_MSG, 140, ALIGN_LEFT);
 		_btnRestore.setText(RESTORE_BTN_STRING);
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 4e17a6f3af..db3958934e 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -523,7 +523,7 @@ void RingworldGame::endGame(int resNum, int lineNum) {
 		// No savegames exist, so prompt the user to restart or quit
 		int rc;
 		if (g_vm->getLanguage() == Common::ES_ESP) {
-			rc = MessageDialog::show(msg, ESP_RW_QUIT_BTN_STRING, ESP_RW_RESTART_BTN_2_STRING);
+			rc = MessageDialog::show(msg, ESP_QUIT_BTN_STRING, ESP_RESTART_BTN_2_STRING);
 		} else {
 			rc = MessageDialog::show(msg, QUIT_BTN_STRING, RESTART_BTN_STRING);
 		}
@@ -540,7 +540,7 @@ void RingworldGame::endGame(int resNum, int lineNum) {
 			} else {
 				int rc;
 				if (g_vm->getLanguage() == Common::ES_ESP) {
-					rc = MessageDialog::show(msg, ESP_RW_RESTART_BTN_2_STRING, ESP_RESTORE_BTN_STRING);
+					rc = MessageDialog::show(msg, ESP_RESTART_BTN_2_STRING, ESP_RESTORE_BTN_STRING);
 				} else {
 					rc = MessageDialog::show(msg, RESTART_BTN_STRING, RESTORE_BTN_STRING);
 				}
@@ -597,7 +597,7 @@ void RingworldGame::processEvent(Event &event) {
 			// F10 - Pause
 			GfxDialog::setPalette();
 			if (g_vm->getLanguage() == Common::ES_ESP) {
-				MessageDialog::show(ESP_RW_GAME_PAUSED_MSG, ESP_CONTINUE_BTN_STRING);
+				MessageDialog::show(ESP_GAME_PAUSED_MSG, ESP_CONTINUE_BTN_STRING);
 			} else {
 				MessageDialog::show(GAME_PAUSED_MSG, CONTINUE_BTN_STRING);
 			}
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 4eef76efc1..55110a4be3 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -569,10 +569,10 @@ void Game::restartGame() {
 	int rc;
 	if (g_vm->getLanguage() == Common::ES_ESP) {
 		if (g_vm->getGameID() == GType_Ringworld) {
-			rc = MessageDialog::show(ESP_RW_RESTART_MSG, ESP_CANCEL_BTN_STRING, ESP_RW_RESTART_BTN_2_STRING);
+			rc = MessageDialog::show(Ringworld::ESP_RESTART_MSG, ESP_CANCEL_BTN_STRING, Ringworld::ESP_RESTART_BTN_2_STRING);
 		}
 		else {
-			rc = MessageDialog::show(ESP_BF_RESTART_MSG, ESP_CANCEL_BTN_STRING, ESP_BF_RESTART_BTN_STRING);
+			rc = MessageDialog::show(BlueForce::ESP_RESTART_MSG, ESP_CANCEL_BTN_STRING, BlueForce::ESP_RESTART_BTN_STRING);
 		}
 	} else {
 		rc = MessageDialog::show(RESTART_MSG, CANCEL_BTN_STRING, RESTART_BTN_STRING);
@@ -611,10 +611,10 @@ void Game::quitGame() {
 	int rc;
 	if (g_vm->getLanguage() == Common::ES_ESP) {
 		if (g_vm->getGameID() == GType_Ringworld) {
-			rc = MessageDialog::show(ESP_RW_QUIT_CONFIRM_2_MSG, ESP_CANCEL_BTN_STRING, ESP_RW_QUIT_BTN_STRING);
+			rc = MessageDialog::show(Ringworld::ESP_QUIT_CONFIRM_2_MSG, ESP_CANCEL_BTN_STRING, Ringworld::ESP_QUIT_BTN_STRING);
 		}
 		else {
-			rc = MessageDialog::show(ESP_BF_QUIT_CONFIRM_MSG, ESP_CANCEL_BTN_STRING, ESP_BF_QUIT_BTN_STRING);
+			rc = MessageDialog::show(BlueForce::ESP_QUIT_CONFIRM_MSG, ESP_CANCEL_BTN_STRING, BlueForce::ESP_QUIT_BTN_STRING);
 		}
 	} else {
 		rc = MessageDialog::show(QUIT_CONFIRM_MSG, CANCEL_BTN_STRING, QUIT_BTN_STRING);
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index d8e70c2718..ac4ba0b514 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -100,27 +100,11 @@ char const *const ESP_SAVING_NOT_ALLOWED_MSG = "No es posible salvar en este mom
 char const *const ESP_RESTORING_NOT_ALLOWED_MSG = "No es posible recuperar una partida en este momento.";
 char const *const ESP_INV_EMPTY_MSG = "No llevas nada contigo.";
 
-char const *const ESP_RW_QUIT_CONFIRM_1_MSG = "\250Quieres abandonar el juego?";
-char const *const ESP_RW_QUIT_CONFIRM_2_MSG = "\250Quieres abandonar esta partida?";
-char const *const ESP_BF_QUIT_CONFIRM_MSG = "\250Quieres dejar de jugar?";
-char const *const ESP_RW_RESTART_MSG = "   \250Quieres empezar de nuevo?    ";
-char const *const ESP_BF_RESTART_MSG = "\250Quieres volver a comenzar el juego?";
-char const *const ESP_RW_GAME_PAUSED_MSG = "Juego pausado";
-char const *const ESP_BF_GAME_PAUSED_MSG = "Juego en pausa.";
 char const *const ESP_OK_BTN_STRING = " Ok ";
 char const *const ESP_CONTINUE_BTN_STRING = " Continuar ";
 char const *const ESP_CANCEL_BTN_STRING = "Cancelar";
-char const *const ESP_RW_QUIT_BTN_STRING = " Abandonar ";
-char const *const ESP_BF_QUIT_BTN_STRING = " Salir ";
-char const *const ESP_RW_RESTART_BTN_1_STRING = "Empezar \rde nuevo";
-char const *const ESP_RW_RESTART_BTN_2_STRING = "Empezar de nuevo";
-char const *const ESP_BF_RESTART_BTN_STRING = "Volver a empezar";
-char const *const ESP_RW_SAVE_BTN_STRING = "Salvar";
-char const *const ESP_BF_SAVE_BTN_STRING = "Guardar";
 char const *const ESP_RESTORE_BTN_STRING = "Recuperar";
 char const *const ESP_SOUND_BTN_STRING = "Sonido";
-char const *const ESP_RW_RESUME_BTN_STRING = " Continuar \rjuego";
-char const *const ESP_BF_RESUME_BTN_STRING = " Seguir \rjugando";
 char const *const ESP_LOOK_BTN_STRING = "Mirar";
 char const *const ESP_PICK_BTN_STRING = "Escoger";
 
@@ -159,6 +143,16 @@ char const *const DEMO_BTN_STRING = "Demo";
 char const *const DEMO_RESUME_BTN_STRING = "Resume";
 
 // Spanish version
+char const *const ESP_QUIT_CONFIRM_1_MSG = "\250Quieres abandonar el juego?";
+char const *const ESP_QUIT_CONFIRM_2_MSG = "\250Quieres abandonar esta partida?";
+char const *const ESP_RESTART_MSG = "   \250Quieres empezar de nuevo?    ";
+char const *const ESP_GAME_PAUSED_MSG = "Juego pausado";
+char const *const ESP_QUIT_BTN_STRING = " Abandonar ";
+char const *const ESP_RESTART_BTN_1_STRING = "Empezar \rde nuevo";
+char const *const ESP_RESTART_BTN_2_STRING = "Empezar de nuevo";
+char const *const ESP_SAVE_BTN_STRING = "Salvar";
+char const *const ESP_RESUME_BTN_STRING = " Continuar \rjuego";
+
 // Dialog resources
 char const *const ESP_HELP_MSG = "Mundo Anillo\x14\rLa Venganza del Patriarca\rVersi\242n ScummVM\r\r\
 \x01 Teclas de aceso r\240pido...\rF2 - Opciones de Sonido\rF3 - Abandonar\r\
@@ -245,6 +239,14 @@ char const *const SCENE570_WACKYDATA = "WACKYDATA";
 char const *const THE_NEXT_DAY = "The Next Day";
 
 // Spanish version
+char const *const ESP_QUIT_CONFIRM_MSG = "\250Quieres dejar de jugar?";
+char const *const ESP_RESTART_MSG = "\250Quieres volver a comenzar el juego?";
+char const *const ESP_GAME_PAUSED_MSG = "Juego en pausa.";
+char const *const ESP_QUIT_BTN_STRING = " Salir ";
+char const *const ESP_RESTART_BTN_STRING = "Volver a empezar";
+char const *const ESP_SAVE_BTN_STRING = "Guardar";
+char const *const ESP_RESUME_BTN_STRING = " Seguir \rjugando";
+
 // Dialog resources
 char const *const ESP_HELP_MSG = "Blue Force\x14\rVersi\242n ScummVM\r\r\
 Funciones del Teclado...\rF2 - Sonido\rF3 - Salir del Juego\r\
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 9544ec0491..b0dd10ccf6 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -69,27 +69,11 @@ extern char const *const ESP_RESTORING_NOT_ALLOWED_MSG;
 extern char const *const ESP_INV_EMPTY_MSG;
 
 // Dialogs
-extern char const *const ESP_RW_QUIT_CONFIRM_1_MSG;
-extern char const *const ESP_RW_QUIT_CONFIRM_2_MSG;
-extern char const *const ESP_BF_QUIT_CONFIRM_MSG;
-extern char const *const ESP_RW_RESTART_MSG;
-extern char const *const ESP_BF_RESTART_MSG;
-extern char const *const ESP_RW_GAME_PAUSED_MSG;
-extern char const *const ESP_BF_GAME_PAUSED_MSG;
 extern char const *const ESP_OK_BTN_STRING;
 extern char const *const ESP_CONTINUE_BTN_STRING;
 extern char const *const ESP_CANCEL_BTN_STRING;
-extern char const *const ESP_RW_QUIT_BTN_STRING;
-extern char const *const ESP_BF_QUIT_BTN_STRING;
-extern char const *const ESP_RW_RESTART_BTN_1_STRING;
-extern char const *const ESP_RW_RESTART_BTN_2_STRING;
-extern char const *const ESP_BF_RESTART_BTN_STRING;
-extern char const *const ESP_RW_SAVE_BTN_STRING;
-extern char const *const ESP_BF_SAVE_BTN_STRING;
 extern char const *const ESP_RESTORE_BTN_STRING;
 extern char const *const ESP_SOUND_BTN_STRING;
-extern char const *const ESP_RW_RESUME_BTN_STRING;
-extern char const *const ESP_BF_RESUME_BTN_STRING;
 extern char const *const ESP_LOOK_BTN_STRING;
 extern char const *const ESP_PICK_BTN_STRING;
 
@@ -127,6 +111,16 @@ extern char const *const DEMO_BTN_STRING;
 extern char const *const DEMO_RESUME_BTN_STRING;
 
 // Spanish version
+extern char const *const ESP_QUIT_CONFIRM_1_MSG;
+extern char const *const ESP_QUIT_CONFIRM_2_MSG;
+extern char const *const ESP_RESTART_MSG;
+extern char const *const ESP_GAME_PAUSED_MSG;
+extern char const *const ESP_QUIT_BTN_STRING;
+extern char const *const ESP_RESTART_BTN_1_STRING;
+extern char const *const ESP_RESTART_BTN_2_STRING;
+extern char const *const ESP_SAVE_BTN_STRING;
+extern char const *const ESP_RESUME_BTN_STRING;
+
 // Dialog resources
 extern char const *const ESP_HELP_MSG;
 extern char const *const ESP_WATCH_INTRO_MSG;
@@ -202,6 +196,14 @@ extern char const *const RADIO_BTN_LIST[8];
 extern char const *const THE_NEXT_DAY;
 
 // Spanish version
+extern char const *const ESP_QUIT_CONFIRM_MSG;
+extern char const *const ESP_RESTART_MSG;
+extern char const *const ESP_GAME_PAUSED_MSG;
+extern char const *const ESP_QUIT_BTN_STRING;
+extern char const *const ESP_RESTART_BTN_STRING;
+extern char const *const ESP_SAVE_BTN_STRING;
+extern char const *const ESP_RESUME_BTN_STRING;
+
 // Dialog resources
 extern char const *const ESP_HELP_MSG;
 extern char const *const ESP_WATCH_INTRO_MSG;


Commit: 9eecd41b6e4cc3a82ccf38568223276323ad4f36
    https://github.com/scummvm/scummvm/commit/9eecd41b6e4cc3a82ccf38568223276323ad4f36
Author: Francisco Javier Diéguez Tirado (javi.dieguez at gmail.com)
Date: 2021-04-11T16:33:19-07:00

Commit Message:
TSAGE: Spanish BlueForce: two different Restart buttons

Options dialog needs shorter text, restart dialog uses longer text

Changed paths:
    engines/tsage/blue_force/blueforce_dialogs.cpp
    engines/tsage/scenes.cpp
    engines/tsage/staticres.cpp
    engines/tsage/staticres.h


diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 237341b70a..e91034a3fa 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -486,7 +486,7 @@ OptionsDialog::OptionsDialog() {
 		_gfxMessage.set(ESP_OPTIONS_MSG, 140, ALIGN_LEFT);
 		_btnRestore.setText(ESP_RESTORE_BTN_STRING);
 		_btnSave.setText(ESP_SAVE_BTN_STRING);
-		_btnRestart.setText(ESP_RESTART_BTN_STRING);
+		_btnRestart.setText(ESP_RESTART_BTN_1_STRING);
 		_btnQuit.setText(ESP_QUIT_BTN_STRING);
 		_btnSound.setText(ESP_SOUND_BTN_STRING);
 		_btnResume.setText(ESP_RESUME_BTN_STRING);
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 55110a4be3..a1d7af0e14 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -572,7 +572,7 @@ void Game::restartGame() {
 			rc = MessageDialog::show(Ringworld::ESP_RESTART_MSG, ESP_CANCEL_BTN_STRING, Ringworld::ESP_RESTART_BTN_2_STRING);
 		}
 		else {
-			rc = MessageDialog::show(BlueForce::ESP_RESTART_MSG, ESP_CANCEL_BTN_STRING, BlueForce::ESP_RESTART_BTN_STRING);
+			rc = MessageDialog::show(BlueForce::ESP_RESTART_MSG, ESP_CANCEL_BTN_STRING, BlueForce::ESP_RESTART_BTN_2_STRING);
 		}
 	} else {
 		rc = MessageDialog::show(RESTART_MSG, CANCEL_BTN_STRING, RESTART_BTN_STRING);
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index ac4ba0b514..ccea40b239 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -243,7 +243,8 @@ char const *const ESP_QUIT_CONFIRM_MSG = "\250Quieres dejar de jugar?";
 char const *const ESP_RESTART_MSG = "\250Quieres volver a comenzar el juego?";
 char const *const ESP_GAME_PAUSED_MSG = "Juego en pausa.";
 char const *const ESP_QUIT_BTN_STRING = " Salir ";
-char const *const ESP_RESTART_BTN_STRING = "Volver a empezar";
+char const *const ESP_RESTART_BTN_1_STRING = "Reiniciar";
+char const *const ESP_RESTART_BTN_2_STRING = "Volver a empezar";
 char const *const ESP_SAVE_BTN_STRING = "Guardar";
 char const *const ESP_RESUME_BTN_STRING = " Seguir \rjugando";
 
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index b0dd10ccf6..13dcfdd999 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -200,7 +200,8 @@ extern char const *const ESP_QUIT_CONFIRM_MSG;
 extern char const *const ESP_RESTART_MSG;
 extern char const *const ESP_GAME_PAUSED_MSG;
 extern char const *const ESP_QUIT_BTN_STRING;
-extern char const *const ESP_RESTART_BTN_STRING;
+extern char const *const ESP_RESTART_BTN_1_STRING;
+extern char const *const ESP_RESTART_BTN_2_STRING;
 extern char const *const ESP_SAVE_BTN_STRING;
 extern char const *const ESP_RESUME_BTN_STRING;
 




More information about the Scummvm-git-logs mailing list