[Scummvm-git-logs] scummvm master -> 59d418a829e1562b2fa795baffb0a485af0b6d6a

aquadran noreply at scummvm.org
Mon Sep 15 19:13:28 UTC 2025


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

Summary:
59d418a829 WINTERMUTE: Cleanup


Commit: 59d418a829e1562b2fa795baffb0a485af0b6d6a
    https://github.com/scummvm/scummvm/commit/59d418a829e1562b2fa795baffb0a485af0b6d6a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-15T21:13:21+02:00

Commit Message:
WINTERMUTE: Cleanup

Changed paths:
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_string_table.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index fb8eca674ea..8136984d4ab 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -2690,13 +2690,13 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 		if (file) {
 			crc remainder = crc_initialize();
 			byte buf[1024];
-			int bytesRead = 0;
+			int32 bytesRead = 0;
 
 			while (bytesRead < file->size()) {
-				uint32 bufSize = MIN((uint32)1024, (uint32)(file->size() - bytesRead));
+				int32 bufSize = MIN<int32>(1024, (int32)file->size() - bytesRead);
 				bytesRead += file->read(buf, bufSize);
 
-				for (uint32 i = 0; i < bufSize; i++) {
+				for (int32 i = 0; i < bufSize; i++) {
 					remainder = crc_process_byte(buf[i], remainder);
 				}
 			}
diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index 485bb60377d..616d7a16815 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -222,7 +222,7 @@ const char *BaseStringTable::expandStatic(const char *string) {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseStringTable::loadFile(const char *filename, bool clearOld) {
-	BaseEngine::LOG(0, "Loading string table...");
+	_game->LOG(0, "Loading string table...");
 
 	if (clearOld) {
 		_filenames.clear();




More information about the Scummvm-git-logs mailing list