[Scummvm-git-logs] scummvm master -> d7033aa42e65bba10a6448ca8cd7839bee00faa8

[neuromancer]

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

Summary:
b7fbe1dc55 FREESCAPE: avoid integer overflow in maxWait
f70e36b53f FREESCAPE: fixed game option enum only used in castle
d510c96ec5 FREESCAPE: corrected an entry in the ECD map in dark
d7033aa42e NEWS: added more freescape news for the upcoming release


Commit: b7fbe1dc5506c74ae9ea27b7cd615901ffe043a0
    https://github.com/scummvm/scummvm/commit/b7fbe1dc5506c74ae9ea27b7cd615901ffe043a0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-17T10:52:11+02:00

Commit Message:
FREESCAPE: avoid integer overflow in maxWait

Changed paths:
    engines/freescape/ui.cpp


diff --git a/engines/freescape/ui.cpp b/engines/freescape/ui.cpp
index 6c839210b34..be1030ea7ce 100644
--- a/engines/freescape/ui.cpp
+++ b/engines/freescape/ui.cpp
@@ -44,7 +44,7 @@ void FreescapeEngine::titleScreen() {
 			case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
 				switch (event.customType) {
 				case kActionChangeModeOrSkip:
-					i = maxWait;
+					maxWait = -1;
 					break;
 				default:
 					break;
@@ -54,7 +54,7 @@ void FreescapeEngine::titleScreen() {
 				// fallthrough
 			case Common::EVENT_LBUTTONDOWN:
 				if (g_system->hasFeature(OSystem::kFeatureTouchscreen))
-					i = maxWait;
+					maxWait = -1;
 				break;
 			default:
 				break;
@@ -225,7 +225,7 @@ void FreescapeEngine::drawBorderScreenAndWait(Graphics::Surface *surface, int ma
 				// fallthrough
 			case Common::EVENT_LBUTTONDOWN:
 				if (g_system->hasFeature(OSystem::kFeatureTouchscreen))
-					i = maxWait;
+					maxWait = -1;
 				break;
 			default:
 				break;


Commit: f70e36b53fd3af990c1f171ac4cffe9a71ad0df8
    https://github.com/scummvm/scummvm/commit/f70e36b53fd3af990c1f171ac4cffe9a71ad0df8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-17T10:52:11+02:00

Commit Message:
FREESCAPE: fixed game option enum only used in castle

Changed paths:
    engines/freescape/detection.h


diff --git a/engines/freescape/detection.h b/engines/freescape/detection.h
index a0c5940715f..7c36bb42d4e 100644
--- a/engines/freescape/detection.h
+++ b/engines/freescape/detection.h
@@ -36,7 +36,7 @@
 
 // Castle Master options
 
-#define GAMEOPTION_TRAVEL_ROCK   GUIO_GAMEOPTIONS8
+#define GAMEOPTION_TRAVEL_ROCK   GUIO_GAMEOPTIONS9
 
 
 #endif


Commit: d510c96ec591f0aa7f28673b40c600da48aea643
    https://github.com/scummvm/scummvm/commit/d510c96ec591f0aa7f28673b40c600da48aea643
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-17T10:52:11+02:00

Commit Message:
FREESCAPE: corrected an entry in the ECD map in dark

Changed paths:
    engines/freescape/games/dark/dark.cpp


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index e384ff62bbd..bcfa62b424e 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -299,9 +299,9 @@ bool DarkEngine::tryDestroyECDFullGame(int index) {
 		case 8:
 			assert(index <= 1);
 			if (index == 0)
-				return true;
-			else if (index == 1)
 				return !(checkECD(18, 0) && checkECD(10, 0)); // Check both
+			else if (index == 1)
+				return true;
 			break;
 
 		case 10:
@@ -407,7 +407,7 @@ bool DarkEngine::tryDestroyECDFullGame(int index) {
 
 bool DarkEngine::tryDestroyECD(int index) {
 	if (isDemo()) {
-		if (index == 1) {
+		if (index == 0) {
 			return false;
 		}
 		return true;


Commit: d7033aa42e65bba10a6448ca8cd7839bee00faa8
    https://github.com/scummvm/scummvm/commit/d7033aa42e65bba10a6448ca8cd7839bee00faa8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-17T10:52:11+02:00

Commit Message:
NEWS: added more freescape news for the upcoming release

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 1bfb0021041..78667712b36 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -34,6 +34,8 @@ For a more comprehensive changelog of the latest experimental code, see:
   - Improved handling of close colinear surfaces.
   - Added "authentic graphics" mode.
   - Fixed several glitches in the different render modes.
+  - Refactored sound handling for different games.
+  - Improved keymapper support coverage.
 
  MM:
    - Added MT32/LAPC-1 support for Xeen engine.