[Scummvm-git-logs] scummvm master -> 334be00ee63dd7fff226bf2b32caa71204fdbbfc

[aquadran]

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:
334be00ee6 WINTERMUTE: Small sync with original code


Commit: 334be00ee63dd7fff226bf2b32caa71204fdbbfc
    https://github.com/scummvm/scummvm/commit/334be00ee63dd7fff226bf2b32caa71204fdbbfc
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-16T08:59:35+02:00

Commit Message:
WINTERMUTE: Small sync with original code

Changed paths:
    engines/wintermute/ad/ad_game.cpp
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/sound/base_sound_buffer.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 240ded02a85..ef4534b320a 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2230,12 +2230,12 @@ char *AdGame::findSpeechFile(char *stringID) {
 
 	for (int32 i = 0; i < _speechDirs.getSize(); i++) {
 		Common::sprintf_s(ret, MAX_PATH_LENGTH, "%s%s.ogg", _speechDirs[i], stringID);
-		if (BaseFileManager::getEngineInstance()->hasFile(ret)) {
+		if (_game->_fileManager->hasFile(ret)) {
 			return ret;
 		}
 
 		Common::sprintf_s(ret, MAX_PATH_LENGTH, "%s%s.wav", _speechDirs[i], stringID);
-		if (BaseFileManager::getEngineInstance()->hasFile(ret)) {
+		if (_game->_fileManager->hasFile(ret)) {
 			return ret;
 		}
 	}
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 8136984d4ab..371a3ca654d 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -2375,8 +2375,10 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 		bool ret = false;
 		BaseImage *image = _game->_renderer->takeScreenshot();
 		if (image) {
-			ret = image->saveBMPFile(filename);
+			ret = DID_SUCCEED(image->saveBMPFile(filename));
 			delete image;
+		} else {
+			ret = false;
 		}
 
 		stack->pushBool(ret);
@@ -2398,8 +2400,10 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 		bool ret = false;
 		BaseImage *image = _game->_renderer->takeScreenshot(sizeX, sizeY);
 		if (image) {
-			ret = image->saveBMPFile(filename);
+			ret = DID_SUCCEED(image->saveBMPFile(filename));
 			delete image;
+		} else {
+			ret = false;
 		}
 
 		stack->pushBool(ret);
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 4018a8c6da4..50acfad0ee3 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -48,7 +48,7 @@ namespace Wintermute {
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-#define MAX_NONSTREAMED_FILE_SIZE 1024*1024
+#define MAX_NONSTREAMED_FILE_SIZE (1024 * 1024)
 
 //////////////////////////////////////////////////////////////////////////
 BaseSoundBuffer::BaseSoundBuffer(BaseGame *inGame) : BaseClass(inGame) {