mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:45:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #192 from OpenMW/master

Browse source 
Add OpenMW commits up to 3 Apr 2017
This commit is contained in:
David Cernat 2017-04-04 01:48:43 +03:00 committed by GitHub
commit 106c9edead
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
components/compiler/exprparser.cpp
View file

@ -311,22 +311,6 @@ namespace Compiler
return true; 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)) if (mExplicit.empty() && getContext().isId (name2))
{ {
mExplicit = name2; mExplicit = name2;

3
files/openmw.cfg
View file

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

3
files/openmw.cfg.local
View file

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