[Scummvm-git-logs] scummvm master -> 60d5dbb99448e20ba0d74836d2c7e4f3b9a79684

[eriktorbjorn]

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

Summary:
d96f834689 GRAPHICS: Remove unused function
60d5dbb994 TEENAGENT: Fix infinite loop when correct language block is not found


Commit: d96f8346893f33d5ed05202a8b97a3b5ffd635fe
    https://github.com/scummvm/scummvm/commit/d96f8346893f33d5ed05202a8b97a3b5ffd635fe
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-07-11T18:31:48+02:00

Commit Message:
GRAPHICS: Remove unused function

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index bb344c4a63d..f240189032b 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -583,23 +583,6 @@ Common::List<Graphics::PixelFormat> SurfaceSdlGraphicsManager::getSupportedForma
 	return _supportedFormats;
 }
 
-#if SDL_VERSION_ATLEAST(2, 0, 0)
-static void maskToBitCount(Uint32 mask, uint8 &numBits, uint8 &shift) {
-	numBits = 0;
-	shift = 32;
-	for (int i = 0; i < 32; ++i) {
-		if (mask & 1) {
-			if (i < shift) {
-				shift = i;
-			}
-			++numBits;
-		}
-
-		mask >>= 1;
-	}
-}
-#endif
-
 void SurfaceSdlGraphicsManager::detectSupportedFormats() {
 	_supportedFormats.clear();
 


Commit: 60d5dbb99448e20ba0d74836d2c7e4f3b9a79684
    https://github.com/scummvm/scummvm/commit/60d5dbb99448e20ba0d74836d2c7e4f3b9a79684
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-07-11T18:31:48+02:00

Commit Message:
TEENAGENT: Fix infinite loop when correct language block is not found

Changed paths:
    engines/teenagent/resources.cpp


diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index a7f799d4acf..7c24cef5de1 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -155,11 +155,11 @@ bool Resources::loadArchives(const ADGameDescription *gd) {
 	// compatibility.
 	Common::SeekableReadStream *dat = Common::wrapCompressedReadStream(dat_file);
 
-	char tempBuffer[256];
+	byte tempBuffer[256];
 	dat->read(tempBuffer, 9);
 	tempBuffer[9] = '\0';
 
-	if (strcmp(tempBuffer, "TEENAGENT") != 0) {
+	if (strcmp((char *)tempBuffer, "TEENAGENT") != 0) {
 		const char *msg = _s("The '%s' engine data file is corrupt.");
 		Common::U32String errorMessage = Common::U32String::format(_(msg), filename.c_str());
 		GUIErrorMessage(errorMessage);