[Scummvm-git-logs] scummvm master -> 54a84b900153ebbe0f7a5e812c342fa7a4b931e4

[bluegr]

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:
00552e62c3 SCI: Stop sleeping if the game is trying to quit
0962edc69b SCI: Silence more incorrect audio patch type warnings
02586ca220 SCI: Fix incorrect ifdef name in Video32
54a84b9001 SCI: Use Common::strlcpy instead of custom strlcpy-equivalent


Commit: 00552e62c398acf787fe57fa2aa209ea933dac43
    https://github.com/scummvm/scummvm/commit/00552e62c398acf787fe57fa2aa209ea933dac43
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-12-05T01:02:26+02:00

Commit Message:
SCI: Stop sleeping if the game is trying to quit

This applies to any sleep, but is particularly noticeable in games
that send SysEx messages to MT-32, which add delays by sleeping in
order to avoid buffer overflows in the device firmware.

Changed paths:
    engines/sci/sci.cpp


diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index c920403..b2a914b 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -859,6 +859,11 @@ void SciEngine::sleep(uint32 msecs) {
 		// let backend process events and update the screen
 		_eventMan->getSciEvent(kSciEventPeek);
 
+		// There is no point in waiting any more if we are just waiting to quit
+		if (g_engine->shouldQuit()) {
+			return;
+		}
+
 #ifdef ENABLE_SCI32
 		// If a game is in a wait loop, kFrameOut is not called, but mouse
 		// movement is still occurring and the screen needs to be updated to


Commit: 0962edc69b5ccd36a9b8fc43dc89dd9e008011be
    https://github.com/scummvm/scummvm/commit/0962edc69b5ccd36a9b8fc43dc89dd9e008011be
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-12-05T01:02:26+02:00

Commit Message:
SCI: Silence more incorrect audio patch type warnings

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 2f7297c..2e64b10 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1626,7 +1626,8 @@ void ResourceManager::readResourcePatchesBase36() {
 
 			// The S/T prefixes often conflict with non-patch files and generate
 			// spurious warnings about invalid patches
-			if (name.hasSuffix(".DLL") || name.hasSuffix(".EXE") || name.hasSuffix(".TXT") || name.hasSuffix(".OLD") || name.hasSuffix(".WIN") || name.hasSuffix(".DOS")) {
+			if (name.hasSuffix(".DLL") || name.hasSuffix(".EXE") || name.hasSuffix(".TXT") || name.hasSuffix(".OLD") || name.hasSuffix(".WIN") || name.hasSuffix(".DOS") ||
+				name.hasSuffix(".HLP") || name.hasSuffix(".DRV")) {
 				continue;
 			}
 


Commit: 02586ca220ca8ddbe45dbabb5f5e8fc1ddaf9342
    https://github.com/scummvm/scummvm/commit/02586ca220ca8ddbe45dbabb5f5e8fc1ddaf9342
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-12-05T01:02:27+02:00

Commit Message:
SCI: Fix incorrect ifdef name in Video32

Changed paths:
    engines/sci/graphics/video32.h


diff --git a/engines/sci/graphics/video32.h b/engines/sci/graphics/video32.h
index d418c58..cbfbe7d 100644
--- a/engines/sci/graphics/video32.h
+++ b/engines/sci/graphics/video32.h
@@ -70,7 +70,7 @@ public:
 	VideoPlayer(EventManager *eventMan, Video::VideoDecoder *decoder = nullptr) :
 		_eventMan(eventMan),
 		_decoder(decoder)
-#ifdef USE_RGB_MODE
+#ifdef USE_RGB_COLOR
 		,
 		_hqVideoMode(false)
 #endif


Commit: 54a84b900153ebbe0f7a5e812c342fa7a4b931e4
    https://github.com/scummvm/scummvm/commit/54a84b900153ebbe0f7a5e812c342fa7a4b931e4
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-12-05T01:02:27+02:00

Commit Message:
SCI: Use Common::strlcpy instead of custom strlcpy-equivalent

Changed paths:
    engines/sci/detection.cpp


diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 2befe36..2e5346b 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -697,8 +697,7 @@ ADDetectedGame SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Comm
 		return ADDetectedGame();
 
 	Common::String gameId = convertSierraGameId(sierraGameId, &s_fallbackDesc.flags, resMan);
-	strncpy(s_fallbackGameIdBuf, gameId.c_str(), sizeof(s_fallbackGameIdBuf) - 1);
-	s_fallbackGameIdBuf[sizeof(s_fallbackGameIdBuf) - 1] = 0;	// Make sure string is NULL terminated
+	Common::strlcpy(s_fallbackGameIdBuf, gameId.c_str(), sizeof(s_fallbackGameIdBuf));
 	s_fallbackDesc.gameId = s_fallbackGameIdBuf;
 
 	// Try to determine the game language