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

[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:
f825b8ba49 WINTERMUTE: Sync with original code


Commit: f825b8ba4999bb6410d919f20ef3e98b65bc3190
    https://github.com/scummvm/scummvm/commit/f825b8ba4999bb6410d919f20ef3e98b65bc3190
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-23T12:48:55+02:00

Commit Message:
WINTERMUTE: Sync with original code

Changed paths:
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_game.h
    engines/wintermute/base/font/base_font_truetype.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index f421463114f..29e905fe2f9 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -246,14 +246,6 @@ BaseGame::BaseGame(const Common::String &targetName) : BaseObject(this), _target
 	_autoSaveSlot = 999;
 	_cursorHidden = false;
 
-	// Block kept as a reminder that the engine CAN run in constrained/touch-mode
-	/*#ifdef __IPHONEOS__
-	    _touchInterface = true;
-	    _constrainedMemory = true; // TODO differentiate old and new iOS devices
-	#else*/
-	_touchInterface = false;
-	_constrainedMemory = false;
-
 	_settings = new BaseGameSettings(this);
 
 #ifdef ENABLE_HEROCRAFT
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index b4dcc124e2a..a0128cd096c 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -295,8 +295,6 @@ public:
 
 	SaveThumbHelper *_cachedThumbnail;
 	void addMem(int32 bytes);
-	bool _touchInterface;
-	bool _constrainedMemory;
 
 	bool stopVideo();
 protected:
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index c3dff1c80a7..c7165fb7352 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -92,22 +92,6 @@ void BaseFontTT::clearCache() {
 
 //////////////////////////////////////////////////////////////////////////
 void BaseFontTT::initLoop() {
-	// we need more aggressive cache management on iOS not to waste too much memory on fonts
-	if (_gameRef->_constrainedMemory) {
-		// purge all cached images not used in the last frame
-		for (int i = 0; i < NUM_CACHED_TEXTS; i++) {
-			if (_cachedTexts[i] == nullptr) {
-				continue;
-			}
-
-			if (!_cachedTexts[i]->_marked) {
-				delete _cachedTexts[i];
-				_cachedTexts[i] = nullptr;
-			} else {
-				_cachedTexts[i]->_marked = false;
-			}
-		}
-	}
 }
 
 //////////////////////////////////////////////////////////////////////////