From 5d4f58c82842f03a8f44a2caaa9a64c99a0bd9d8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 25 May 2016 21:37:56 +0200
Subject: [PATCH] Fix being unable to activate objects when scripts are
 disabled

The if statement was a leftover of the previous activate implementation and is no longer needed.
---
 apps/openmw/mwworld/worldimp.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b3643cafc..f2a03b876 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3178,13 +3178,10 @@ namespace MWWorld
     {
         breakInvisibility(actor);
 
-        if (mScriptsEnabled)
+        if (object.getRefData().activate())
         {
-            if (object.getRefData().activate())
-            {
-                boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
-                action->execute (actor);
-            }
+            boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
+            action->execute (actor);
         }
     }