Skip to content

Commit f825b8b

Browse files
committed
WINTERMUTE: Sync with original code
1 parent 12b8551 commit f825b8b

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

engines/wintermute/base/base_game.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,6 @@ BaseGame::BaseGame(const Common::String &targetName) : BaseObject(this), _target
246246
_autoSaveSlot = 999;
247247
_cursorHidden = false;
248248

249-
// Block kept as a reminder that the engine CAN run in constrained/touch-mode
250-
/*#ifdef __IPHONEOS__
251-
_touchInterface = true;
252-
_constrainedMemory = true; // TODO differentiate old and new iOS devices
253-
#else*/
254-
_touchInterface = false;
255-
_constrainedMemory = false;
256-
257249
_settings = new BaseGameSettings(this);
258250

259251
#ifdef ENABLE_HEROCRAFT

engines/wintermute/base/base_game.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,6 @@ class BaseGame: public BaseObject {
295295

296296
SaveThumbHelper *_cachedThumbnail;
297297
void addMem(int32 bytes);
298-
bool _touchInterface;
299-
bool _constrainedMemory;
300298

301299
bool stopVideo();
302300
protected:

engines/wintermute/base/font/base_font_truetype.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,6 @@ void BaseFontTT::clearCache() {
9292

9393
//////////////////////////////////////////////////////////////////////////
9494
void BaseFontTT::initLoop() {
95-
// we need more aggressive cache management on iOS not to waste too much memory on fonts
96-
if (_gameRef->_constrainedMemory) {
97-
// purge all cached images not used in the last frame
98-
for (int i = 0; i < NUM_CACHED_TEXTS; i++) {
99-
if (_cachedTexts[i] == nullptr) {
100-
continue;
101-
}
102-
103-
if (!_cachedTexts[i]->_marked) {
104-
delete _cachedTexts[i];
105-
_cachedTexts[i] = nullptr;
106-
} else {
107-
_cachedTexts[i]->_marked = false;
108-
}
109-
}
110-
}
11195
}
11296

11397
//////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)