[Scummvm-git-logs] scummvm master -> 3994680ad5513bc41ad72527e2aa5be4a8691998

[mgerhardy]

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:
3994680ad5 TWINE: fixed 'leaving text windows via space also triggers an attack if in aggressive mode'


Commit: 3994680ad5513bc41ad72527e2aa5be4a8691998
    https://github.com/scummvm/scummvm/commit/3994680ad5513bc41ad72527e2aa5be4a8691998
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-25T17:54:40+01:00

Commit Message:
TWINE: fixed 'leaving text windows via space also triggers an attack if in aggressive mode'

see https://bugs.scummvm.org/ticket/12070

Changed paths:
    engines/twine/input.cpp
    engines/twine/input.h
    engines/twine/text.cpp


diff --git a/engines/twine/input.cpp b/engines/twine/input.cpp
index 7e9b9baf2b..11d38b8c2b 100644
--- a/engines/twine/input.cpp
+++ b/engines/twine/input.cpp
@@ -84,6 +84,10 @@ bool Input::isHeroActionActive() const {
 	return isActionActive(TwinEActionType::ExecuteBehaviourAction) || isActionActive(TwinEActionType::SpecialAction);
 }
 
+bool Input::resetHeroActions() {
+	return toggleActionIfActive(TwinEActionType::ExecuteBehaviourAction) || toggleActionIfActive(TwinEActionType::SpecialAction);
+}
+
 bool Input::enableAdditionalKeyMap(const char *id, bool enable) {
 	Common::Keymapper *keymapper = g_system->getEventManager()->getKeymapper();
 	Common::Keymap *keymap = keymapper->getKeymap(id);
diff --git a/engines/twine/input.h b/engines/twine/input.h
index 286d586eae..a748fc6863 100644
--- a/engines/twine/input.h
+++ b/engines/twine/input.h
@@ -150,6 +150,7 @@ public:
 	bool isQuickBehaviourActionActive() const;
 	bool isMoveOrTurnActionActive() const;
 	bool isHeroActionActive() const;
+	bool resetHeroActions();
 
 	/**
 	 * Gets mouse positions
diff --git a/engines/twine/text.cpp b/engines/twine/text.cpp
index 3cd47ad497..6facd9ff4c 100644
--- a/engines/twine/text.cpp
+++ b/engines/twine/text.cpp
@@ -644,6 +644,7 @@ bool Text::displayText(int32 index, bool showText, bool playVox) {
 	voxHiddenIndex = 0;
 	hasHiddenVox = false;
 	_hasValidTextHandle = false;
+	_engine->_input->resetHeroActions();
 
 	return aborted;
 }