[Scummvm-git-logs] scummvm master -> 8c2bcef734e669ba365ad15dc915711f9cbebccd

[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:
8c2bcef734 WINTERMUTE: Synced with original code


Commit: 8c2bcef734e669ba365ad15dc915711f9cbebccd
    https://github.com/scummvm/scummvm/commit/8c2bcef734e669ba365ad15dc915711f9cbebccd
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-05T22:58:44+02:00

Commit Message:
WINTERMUTE: Synced with original code

Changed paths:
    engines/wintermute/base/base_object.cpp
    engines/wintermute/base/base_sub_frame.cpp
    engines/wintermute/base/base_surface_storage.cpp
    engines/wintermute/base/gfx/base_surface.h


diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index cc046d1106b..93237ec2df0 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -538,7 +538,7 @@ bool BaseObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 		stack->correctParams(0);
 
 		if (_shadowImage) {
-			stack->pushString(_shadowImage->getFileName());
+			stack->pushString(_shadowImage->_filename.c_str());
 		} else {
 			stack->pushNULL();
 		}
@@ -1122,7 +1122,7 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
 		Common::String tempString;
 		if (persistMgr->getIsSaving()) {
 			if (_shadowImage) {
-				tempString = _shadowImage->getFileName();
+				tempString = _shadowImage->_filename.c_str();
 			}
 			persistMgr->transferString(TMEMBER(tempString));
 		} else {
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index fa83580e250..521fff314f0 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -297,8 +297,8 @@ bool BaseSubFrame::saveAsText(BaseDynamicBuffer *buffer, int indent, bool comple
 		buffer->putTextIndent(indent, "SUBFRAME {\n");
 	}
 
-	if (_surface && _surface->getFileNameStr() != "") {
-		buffer->putTextIndent(indent + 2, "IMAGE = \"%s\"\n", _surface->getFileName());
+	if (_surface && _surface->_filename != "") {
+		buffer->putTextIndent(indent + 2, "IMAGE = \"%s\"\n", _surface->_filename.c_str());
 	}
 
 	if (_transparent != 0xFFFF00FF) {
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index e16033ad9bf..e1a6c330033 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -55,7 +55,7 @@ BaseSurfaceStorage::~BaseSurfaceStorage() {
 bool BaseSurfaceStorage::cleanup(bool warn) {
 	for (int32 i = 0; i < _surfaces.getSize(); i++) {
 		if (warn) {
-			BaseEngine::LOG(0, "BaseSurfaceStorage warning: purging surface '%s', usage:%d", _surfaces[i]->getFileName(), _surfaces[i]->_referenceCount);
+			BaseEngine::LOG(0, "BaseSurfaceStorage warning: purging surface '%s', usage:%d", _surfaces[i]->_filename.c_str(), _surfaces[i]->_referenceCount);
 		}
 		delete _surfaces[i];
 	}
@@ -104,7 +104,7 @@ bool BaseSurfaceStorage::removeSurface(BaseSurface *surface) {
 //////////////////////////////////////////////////////////////////////
 BaseSurface *BaseSurfaceStorage::addSurface(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
 	for (int32 i = 0; i < _surfaces.getSize(); i++) {
-		if (scumm_stricmp(_surfaces[i]->getFileName(), filename) == 0) {
+		if (scumm_stricmp(_surfaces[i]->_filename.c_str(), filename) == 0) {
 			_surfaces[i]->_referenceCount++;
 			return _surfaces[i];
 		}
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index 6c146134cab..a7c27aa3fde 100644
--- a/engines/wintermute/base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -75,6 +75,7 @@ public:
 	void setSize(int width, int height);
 
 	int _referenceCount;
+	Common::String _filename;
 
 	virtual int getWidth() {
 		return _width;
@@ -82,13 +83,10 @@ public:
 	virtual int getHeight() {
 		return _height;
 	}
-	Common::String getFileNameStr() { return _filename; }
-	const char* getFileName() { return _filename.c_str(); }
 	//void SetWidth(int Width) { _width = Width;    }
 	//void SetHeight(int Height){ _height = Height; }
 protected:
 
-	Common::String _filename;
 	int32 _height;
 	int32 _width;