From 5575242299d660b892686ccde5f210bb243cc650 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 30 Nov 2019 20:05:20 +0200 Subject: [PATCH] [Client] Don't allow players to attack while in persuasion dialogue --- apps/openmw/mwinput/inputmanagerimp.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp index 6ac5ba4de..25a7d4af0 100644 --- a/apps/openmw/mwinput/inputmanagerimp.cpp +++ b/apps/openmw/mwinput/inputmanagerimp.cpp @@ -376,6 +376,17 @@ namespace MWInput else { + /* + Start of tes3mp addition + + Prevent players from starting attacks while in the persuasion submenu in dialogue + */ + if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Dialogue)) + return; + /* + End of tes3mp addition + */ + MWMechanics::DrawState_ state = MWBase::Environment::get().getWorld()->getPlayer().getDrawState(); mPlayer->setAttackingOrSpell(currentValue != 0 && state != MWMechanics::DrawState_Nothing); }