[Scummvm-git-logs] scummvm branch-2-8 -> 185467a20db2d901d928a366b31112f1ba198b60

mgerhardy noreply at scummvm.org
Sat Jan 6 12:46:58 UTC 2024


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:
185467a20d TWINE: Fixed glitches from using the holomap #14808


Commit: 185467a20db2d901d928a366b31112f1ba198b60
    https://github.com/scummvm/scummvm/commit/185467a20db2d901d928a366b31112f1ba198b60
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2024-01-06T13:46:52+01:00

Commit Message:
TWINE: Fixed glitches from using the holomap #14808

https://bugs.scummvm.org/ticket/14808

Changed paths:
    engines/twine/twine.cpp


diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 270749919fd..89b4916f624 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -947,9 +947,12 @@ bool TwinEEngine::runGameEngine() { // mainLoopInteration
 
 		// Draw holomap
 		if (_input->toggleActionIfActive(TwinEActionType::OpenHolomap) && _gameState->hasItem(InventoryItems::kiHolomap) && !_gameState->inventoryDisabled()) {
-			ScopedEngineFreeze freeze(this);
 			testRestoreModeSVGA(true);
+			freezeTime(false);
 			_holomap->holoMap();
+			// unfreeze here - the redrawEngineActions is also doing a freeze
+			// see https://bugs.scummvm.org/ticket/14808
+			unfreezeTime();
 			_screens->_fadePalette = true;
 			_redraw->redrawEngineActions(true);
 		}




More information about the Scummvm-git-logs mailing list