Merge pull request #192 from OpenMW/master

Add OpenMW commits up to 3 Apr 2017

components/compiler/exprparser.cpp

@@ -311,22 +311,6 @@ namespace Compiler
                 return true;
             }
 
-            // die in a fire, Morrowind script compiler!
-            if (const Extensions *extensions = getContext().getExtensions())
-            {
-                if (getContext().isJournalId (name2))
-                {
-                    // JournalID used as an argument. Use the index of that JournalID
-                    Generator::pushString (mCode, mLiterals, name2);
-                    int keyword = extensions->searchKeyword ("getjournalindex");
-                    extensions->generateFunctionCode (keyword, mCode, mLiterals, mExplicit, 0);
-                    mNextOperand = false;
-                    mOperands.push_back ('l');
-
-                    return true;
-                }
-            }
-
             if (mExplicit.empty() && getContext().isId (name2))
             {
                 mExplicit = name2;

files/openmw.cfg

@@ -8,3 +8,6 @@ resources=${OPENMW_RESOURCE_FILES}
 script-blacklist=Museum
 script-blacklist=MockChangeScript
 script-blacklist=doortestwarp
+script-blacklist=WereChange2Script
+script-blacklist=wereDreamScript2
+script-blacklist=wereDreamScript3

files/openmw.cfg.local

@@ -9,3 +9,6 @@ resources=./resources
 script-blacklist=Museum
 script-blacklist=MockChangeScript
 script-blacklist=doortestwarp
+script-blacklist=WereChange2Script
+script-blacklist=wereDreamScript2
+script-blacklist=wereDreamScript3