mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-29 04:20:29 +00:00
Remove evil "implicit GetJournalIndex" hack from expression parser
This commit is contained in:
parent
ab8294b281
commit
395e97cf40
@ -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;
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user