[Scummvm-git-logs] scummvm master -> 67498b0b981f25714058147de14bc8077cb7e859

[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:
67498b0b98 WINTERMUTE: Move _editorResolutionWidth/Height outside ENABLE_WME3D flag


Commit: 67498b0b981f25714058147de14bc8077cb7e859
    https://github.com/scummvm/scummvm/commit/67498b0b981f25714058147de14bc8077cb7e859
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2026-01-31T15:30:59+01:00

Commit Message:
WINTERMUTE: Move _editorResolutionWidth/Height outside ENABLE_WME3D flag

Changed paths:
    engines/wintermute/ad/ad_game.cpp
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_scene.h
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_game.h


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index c5b72b992dd..1486a10ece3 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2492,12 +2492,10 @@ bool AdGame::getLayerSize(int *layerWidth, int *layerHeight, Common::Rect32 *vie
 		{
 			*layerWidth = _scene->_mainLayer->_width;
 			*layerHeight = _scene->_mainLayer->_height;
-#ifdef ENABLE_WME3D
 			if (_game->_editorResolutionWidth > 0)
 				*layerWidth = _game->_editorResolutionWidth;
 			if (_game->_editorResolutionHeight > 0)
 				*layerHeight = _game->_editorResolutionHeight;
-#endif
 		}
 		return true;
 	} else
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index b846d03809c..f5531c5730f 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -141,10 +141,8 @@ void AdScene::setDefaults() {
 	_editorShowEntities = true;
 	_editorShowScale    = true;
 
-#ifdef ENABLE_WME3D
 	_editorResolutionWidth = 0;
 	_editorResolutionHeight = 0;
-#endif
 
 	_shieldWindow = nullptr;
 
@@ -967,7 +965,6 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 			parseEditorProperty(params, false);
 			break;
 
-#ifdef ENABLE_WME3D
 		case TOKEN_EDITOR_RESOLUTION_WIDTH:
 			parser.scanStr(params, "%d", &_editorResolutionWidth);
 			break;
@@ -976,6 +973,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 			parser.scanStr(params, "%d", &_editorResolutionHeight);
 			break;
 
+#ifdef ENABLE_WME3D
 		case TOKEN_FOV_OVERRIDE:
 			parser.scanStr(params, "%f", &_fov);
 			break;
@@ -1050,6 +1048,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 			_geom->render(false);
 		}
 	}
+#endif
 
 	if (_mainLayer) {
 		if (_editorResolutionWidth <= 0)
@@ -1057,7 +1056,6 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 		if (_editorResolutionHeight <= 0)
 			_editorResolutionHeight = _mainLayer->_height;
 	}
-#endif
 
 	return STATUS_OK;
 }
@@ -3106,6 +3104,8 @@ bool AdScene::persist(BasePersistenceManager *persistMgr) {
 		_fogStart = 0.0f;
 		_fogEnd = 0.0f;
 	}
+#else
+	_editorResolutionWidth = _editorResolutionHeight = 0;
 #endif
 
 	return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index d47f3aed65c..0a935261c57 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -78,8 +78,10 @@ public:
 	float _nearClipPlane;
 	float _farClipPlane;
 	float _fov;
+#endif
 	int32 _editorResolutionWidth;
 	int32 _editorResolutionHeight;
+#ifdef ENABLE_WME3D
 	Light3D *getActiveLight();
 #endif
 	bool getRegionsAt(int x, int y, AdRegion **regionList, int numRegions);
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 673dd7b04fc..925c2fc867c 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -263,10 +263,10 @@ BaseGame::BaseGame(const Common::String &targetName) : BaseObject(this), _target
 #ifdef ENABLE_WME3D
 	_maxShadowType = SHADOW_STENCIL;
 	_supportsRealTimeShadows = false;
+#endif
 
 	_editorResolutionWidth = 0;
 	_editorResolutionHeight = 0;
-#endif
 
 	_localSaveDir = nullptr;
 	BaseUtils::setString(&_localSaveDir, "saves");
@@ -4720,6 +4720,8 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	} else {
 		_editorResolutionWidth = _editorResolutionHeight = 0;
 	}
+#else
+	_editorResolutionWidth = _editorResolutionHeight = 0;
 #endif
 
 	persistMgr->transferSint32(TMEMBER_INT(_textEncoding));
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index f43cbaa7add..e0a43d96306 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -158,10 +158,8 @@ public:
 	bool _richSavedGames;
 	char *_savedGameExt;
 
-#ifdef ENABLE_WME3D
 	int32 _editorResolutionWidth;
 	int32 _editorResolutionHeight;
-#endif
 
 	char *_loadImageName;
 	char *_saveImageName;