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

[aquadran]

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

Summary:
bc460682fd WINTERMUTE: Fixes for CID: 1497889, 1551694, 1551823, 1551889, 1551913, 1551950


Commit: bc460682fd4821195d416b774a5e95db94225bb9
    https://github.com/scummvm/scummvm/commit/bc460682fd4821195d416b774a5e95db94225bb9
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-28T12:01:41+01:00

Commit Message:
WINTERMUTE: Fixes for CID: 1497889, 1551694, 1551823, 1551889, 1551913, 1551950

Changed paths:
    engines/wintermute/base/gfx/xfile_loader.h
    engines/wintermute/base/scriptables/script_engine.cpp


diff --git a/engines/wintermute/base/gfx/xfile_loader.h b/engines/wintermute/base/gfx/xfile_loader.h
index eda00af85e9..dd4aefcdcaa 100644
--- a/engines/wintermute/base/gfx/xfile_loader.h
+++ b/engines/wintermute/base/gfx/xfile_loader.h
@@ -390,9 +390,9 @@ private:
 	const int kCabInputmax = kCabBlockSize + 12;
 
 	bool _initialised{};
-	XToken _currentToken;
+	XToken _currentToken{};
 	byte *_decompBuffer{};
-	byte *_buffer;
+	byte *_buffer{};
 	uint32 _bufferLeft;
 	bool _isText;
 	uint32 _listNbElements;
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 05ef2f16103..456bc2cef99 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -414,7 +414,7 @@ bool ScEngine::tickUnbreakable() {
 //////////////////////////////////////////////////////////////////////////
 bool ScEngine::removeFinishedScripts() {
 	// remove finished scripts
-	for (uint32 i = 0; i < _scripts.size(); i++) {
+	for (int32 i = 0; i < (int32)_scripts.size(); i++) {
 		if (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR) {
 			if (!_scripts[i]->_thread && _scripts[i]->_owner) {
 				_scripts[i]->_owner->removeScript(_scripts[i]);