From 7d918caa9355f59cb37f38c326a5fbf9523d9604 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 16 Feb 2013 16:26:40 +0100 Subject: [PATCH] Don't allow dialogue if player controls are disabled. --- apps/openmw/mwworld/actiontalk.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwworld/actiontalk.cpp b/apps/openmw/mwworld/actiontalk.cpp index 905497f85..59b37370a 100644 --- a/apps/openmw/mwworld/actiontalk.cpp +++ b/apps/openmw/mwworld/actiontalk.cpp @@ -3,6 +3,7 @@ #include "../mwbase/environment.hpp" #include "../mwbase/dialoguemanager.hpp" +#include "../mwbase/inputmanager.hpp" namespace MWWorld { @@ -10,6 +11,7 @@ namespace MWWorld void ActionTalk::executeImp (const Ptr& actor) { - MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget()); + if (MWBase::Environment::get().getInputManager ()->getControlSwitch ("playercontrols")) + MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget()); } }