[Scummvm-git-logs] scummvm master -> 51b587916c2a8a579973c50df7baa66119a0aebc

[mgerhardy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6c50c68392 TWINE: remove clover leaf like in the original source
51b587916c TWINE: pressing enter to choose an item in the inventory also recenters the camera


Commit: 6c50c68392bb59a7b99765597f6e1100423703ff
    https://github.com/scummvm/scummvm/commit/6c50c68392bb59a7b99765597f6e1100423703ff
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-07-10T20:44:10+02:00

Commit Message:
TWINE: remove clover leaf like in the original source

Changed paths:
    engines/twine/menu/menu.cpp


diff --git a/engines/twine/menu/menu.cpp b/engines/twine/menu/menu.cpp
index d61f29fb310..d83ed5433a7 100644
--- a/engines/twine/menu/menu.cpp
+++ b/engines/twine/menu/menu.cpp
@@ -1251,8 +1251,8 @@ void Menu::processInventoryMenu() {
 
 	if (_engine->_gameState->_inventoryNumLeafs > 0) {
 		_engine->_gameState->giveItem(InventoryItems::kiCloverLeaf);
-		// TODO: shouldn't this get reset? } else {
-		//	_engine->_gameState->removeItem(InventoryItems::kiCloverLeaf);
+	} else {
+		_engine->_gameState->removeItem(InventoryItems::kiCloverLeaf);
 	}
 
 	const int32 left = _engine->width() / 2 - 303;


Commit: 51b587916c2a8a579973c50df7baa66119a0aebc
    https://github.com/scummvm/scummvm/commit/51b587916c2a8a579973c50df7baa66119a0aebc
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-07-10T20:44:10+02:00

Commit Message:
TWINE: pressing enter to choose an item in the inventory also recenters the camera

both keys are mapped to return in the default state - this leads to a reset of a camera

a better fix would be to should just disable the main bindings but then the closing of
the menu with esc isn't working anymore

Changed paths:
    engines/twine/menu/menu.cpp


diff --git a/engines/twine/menu/menu.cpp b/engines/twine/menu/menu.cpp
index d83ed5433a7..970e10800fc 100644
--- a/engines/twine/menu/menu.cpp
+++ b/engines/twine/menu/menu.cpp
@@ -1359,6 +1359,9 @@ void Menu::processInventoryMenu() {
 	_engine->_gameState->initEngineProjections();
 
 	_engine->_text->initSceneTextBank();
+
+	// this is a hack to 'fix' https://bugs.scummvm.org/ticket/13677
+	_engine->_input->toggleActionIfActive(TwinEActionType::RecenterScreenOnTwinsen);
 }
 
 } // namespace TwinE