[Scummvm-git-logs] scummvm master -> 81df6c33cfafb3b6491251331b470d3f8aef08b8

[dreammaster]

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

Summary:
277df95c84 TSAGE: Ringworld Spanish detection Floppy & CD versions
81df6c33cf TSAGE: Fix crash if pressing F1 early in Blue Force


Commit: 277df95c8442dfcd34736f08c67effd10c13dfd9
    https://github.com/scummvm/scummvm/commit/277df95c8442dfcd34736f08c67effd10c13dfd9
Author: Francisco Javier Diéguez Tirado (javi.dieguez at gmail.com)
Date: 2021-04-12T18:25:51-07:00

Commit Message:
TSAGE: Ringworld Spanish detection Floppy & CD versions

The story with Ringworld Spanish is the same as Blue Force Spanish.
It was originally released on Floppy, and the CD version is just the
installed Floppy version put onto CD. But it does not contain any audio
tracks at all, and is best handled as Floppy.

Changed paths:
    engines/tsage/detection_tables.h


diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index 9dc5757fa5..3e87e48fd9 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -40,19 +40,19 @@ static const tSageGameDescription gameDescriptions[] = {
 		GType_Ringworld,
 		GF_CD | GF_ALT_REGIONS
 	},
-	// Ringworld Spanish CD
+	// Ringworld Spanish Floppy and CD use the same files
 	{
 		{
 			"ringworld",
-			"CD",
+			"",
 			AD_ENTRY1s("ring.rlb", "cb8bba91b30cd172712371d7123bd763", 7427980),
 			Common::ES_ESP,
 			Common::kPlatformDOS,
-			ADGF_CD,
+			ADGF_NO_FLAGS,
 			GUIO2(GUIO_NOSPEECH, GUIO_NOSFX)
 		},
 		GType_Ringworld,
-		GF_CD | GF_ALT_REGIONS
+		GF_FLOPPY | GF_ALT_REGIONS
 	},
 	// Ringworld English Floppy version
 	{


Commit: 81df6c33cfafb3b6491251331b470d3f8aef08b8
    https://github.com/scummvm/scummvm/commit/81df6c33cfafb3b6491251331b470d3f8aef08b8
Author: Francisco Javier Diéguez Tirado (javi.dieguez at gmail.com)
Date: 2021-04-12T18:25:51-07:00

Commit Message:
TSAGE: Fix crash if pressing F1 early in Blue Force

The game was crashing if the help dialog was shown before the Intro.
This happened because of an out of bounds rectangle and affected both
the English and Spanish versions.

It seems like this was never reported as a bug, but I just happened to
find when doing some testing of the game dialogs.

Changed paths:
    engines/tsage/blue_force/blueforce_logic.cpp


diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index d3a13d8c62..5c3a07463d 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -296,11 +296,15 @@ void BlueForceGame::processEvent(Event &event) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_F1:
 			// F1 - Help
+			int tmp;
+			tmp = BF_GLOBALS._dialogCenter.y;
+			BF_GLOBALS._dialogCenter.y = 100;
 			if (g_vm->getLanguage() == Common::ES_ESP) {
 				MessageDialog::show(ESP_HELP_MSG, ESP_OK_BTN_STRING);
 			} else {
 				MessageDialog::show(HELP_MSG, OK_BTN_STRING);
 			}
+			BF_GLOBALS._dialogCenter.y = tmp;
 			break;
 
 		case Common::KEYCODE_F2: