[Scummvm-git-logs] scummvm master -> 7056f95ff07ece9ace56b9284d37c4312710f00b

[mgerhardy]

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:
a79e7b5a6d TWINE: Reverted new detection entries
9bb1b9b0ab TWINE: fixed missing TF_VERSION_USA flag for USA release of lba1
7056f95ff0 TWINE: activate location rendering


Commit: a79e7b5a6de1ce79addb34dbf71f1517b65e7790
    https://github.com/scummvm/scummvm/commit/a79e7b5a6de1ce79addb34dbf71f1517b65e7790
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-26T00:09:31+01:00

Commit Message:
TWINE: Reverted new detection entries

This reverts commit 1ccb275f83d0092fea80ad11c46b2ea964e14b94.

The RELENT.EXE was missing in the game directory. This entry is already
included.

Changed paths:
    engines/twine/detection.cpp


diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index 59f93818f6..801943353b 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -402,53 +402,6 @@ static const ADGameDescription twineGameDescriptions[] = {
 		GUIO1(GUIO_NONE)
 	},
 
-	// https://bugs.scummvm.org/ticket/12078
-	{
-		"lba",
-		"",
-		AD_ENTRY1s("text.hqr", "ae7343552f8fbd17a1fc6cea2197a912", 248654),
-		Common::EN_USA,
-		Common::kPlatformDOS,
-		ADGF_TESTING | TwinE::TF_VERSION_USA,
-		GUIO1(GUIO_NONE)
-	},
-	{
-		"lba",
-		"",
-		AD_ENTRY1s("text.hqr", "ae7343552f8fbd17a1fc6cea2197a912", 248654),
-		Common::ES_ESP,
-		Common::kPlatformDOS,
-		ADGF_TESTING | TwinE::TF_VERSION_USA,
-		GUIO1(GUIO_NONE)
-	},
-	{
-		"lba",
-		"",
-		AD_ENTRY1s("text.hqr", "ae7343552f8fbd17a1fc6cea2197a912", 248654),
-		Common::IT_ITA,
-		Common::kPlatformDOS,
-		ADGF_TESTING | TwinE::TF_VERSION_USA,
-		GUIO1(GUIO_NONE)
-	},
-	{
-		"lba",
-		"",
-		AD_ENTRY1s("text.hqr", "ae7343552f8fbd17a1fc6cea2197a912", 248654),
-		Common::FR_FRA,
-		Common::kPlatformDOS,
-		ADGF_TESTING | TwinE::TF_VERSION_USA,
-		GUIO1(GUIO_NONE)
-	},
-	{
-		"lba",
-		"",
-		AD_ENTRY1s("text.hqr", "ae7343552f8fbd17a1fc6cea2197a912", 248654),
-		Common::DE_DEU,
-		Common::kPlatformDOS,
-		ADGF_TESTING | TwinE::TF_VERSION_USA,
-		GUIO1(GUIO_NONE)
-	},
-
 	// FAN Translations - http://lba.fishos.net/bit/index.html
 
 	// Portuguese by xesf (alexfont)


Commit: 9bb1b9b0abbe730489fe659eaf5aee9a1f1f1c8f
    https://github.com/scummvm/scummvm/commit/9bb1b9b0abbe730489fe659eaf5aee9a1f1f1c8f
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-26T00:09:31+01:00

Commit Message:
TWINE: fixed missing TF_VERSION_USA flag for USA release of lba1

Changed paths:
    engines/twine/detection.cpp


diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index 801943353b..56a896bf20 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -162,7 +162,7 @@ static const ADGameDescription twineGameDescriptions[] = {
 		AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
 		Common::EN_ANY,
 		Common::kPlatformDOS,
-		ADGF_TESTING,
+		ADGF_TESTING | TwinE::TF_VERSION_USA,
 		GUIO1(GUIO_NONE)
 	},
 	{
@@ -171,7 +171,7 @@ static const ADGameDescription twineGameDescriptions[] = {
 		AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
 		Common::FR_FRA,
 		Common::kPlatformDOS,
-		ADGF_TESTING,
+		ADGF_TESTING | TwinE::TF_VERSION_USA,
 		GUIO1(GUIO_NONE)
 	},
 	{
@@ -180,7 +180,7 @@ static const ADGameDescription twineGameDescriptions[] = {
 		AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
 		Common::DE_DEU,
 		Common::kPlatformDOS,
-		ADGF_TESTING,
+		ADGF_TESTING | TwinE::TF_VERSION_USA,
 		GUIO1(GUIO_NONE)
 	},
 	{
@@ -189,7 +189,7 @@ static const ADGameDescription twineGameDescriptions[] = {
 		AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
 		Common::IT_ITA,
 		Common::kPlatformDOS,
-		ADGF_TESTING,
+		ADGF_TESTING | TwinE::TF_VERSION_USA,
 		GUIO1(GUIO_NONE)
 	},
 	{
@@ -198,7 +198,7 @@ static const ADGameDescription twineGameDescriptions[] = {
 		AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
 		Common::ES_ESP,
 		Common::kPlatformDOS,
-		ADGF_TESTING,
+		ADGF_TESTING | TwinE::TF_VERSION_USA,
 		GUIO1(GUIO_NONE)
 	},
 


Commit: 7056f95ff07ece9ace56b9284d37c4312710f00b
    https://github.com/scummvm/scummvm/commit/7056f95ff07ece9ace56b9284d37c4312710f00b
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-26T00:09:31+01:00

Commit Message:
TWINE: activate location rendering

Changed paths:
    engines/twine/holomap.cpp


diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index 923a47a6a5..3424ad6e03 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -516,10 +516,10 @@ void Holomap::processHolomap() {
 			_engine->_interface->drawSplittedBox(rect, COLOR_BLACK);
 			_engine->_renderer->setBaseRotation(xRot, yRot, 0);
 			_engine->_renderer->setLightVector(xRot, yRot, 0);
-			// renderLocations(xRot, yRot, 0, false); // TODO: activate me
+			renderLocations(xRot, yRot, 0, false);
 			_engine->_renderer->setBaseRotation(xRot, yRot, 0);
 			renderHolomapSurfacePolygons();
-			// renderLocations(xRot, yRot, 0, true); // TODO: activate me
+			renderLocations(xRot, yRot, 0, true);
 			if (rotate) {
 				_engine->_menu->drawBox(300, 170, 340, 210);
 			}