krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Make GetFactionReaction garbage argument optional

Browse source
This commit is contained in:
scrawl 2014-06-25 01:12:57 +02:00
parent 3d9bdad8ba
commit b259c5def2
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwscript/dialogueextensions.cpp
View file

@ -227,9 +227,6 @@ namespace MWScript
std::string faction2 = runtime.getStringLiteral (runtime[0].mInteger); std::string faction2 = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
// ignore extra garbage argument
runtime.pop();
runtime.push(MWBase::Environment::get().getDialogueManager() runtime.push(MWBase::Environment::get().getDialogueManager()
->getFactionReaction(faction1, faction2)); ->getFactionReaction(faction1, faction2));
} }

2
components/compiler/extensions0.cpp
View file

@ -180,7 +180,7 @@ namespace Compiler
extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction, extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction,
opcodeSameFactionExplicit); opcodeSameFactionExplicit);
extensions.registerInstruction("modfactionreaction", "ccl", opcodeModFactionReaction); extensions.registerInstruction("modfactionreaction", "ccl", opcodeModFactionReaction);
extensions.registerFunction("getfactionreaction", 'l', "ccl", opcodeGetFactionReaction); extensions.registerFunction("getfactionreaction", 'l', "ccX", opcodeGetFactionReaction);
extensions.registerInstruction("clearinfoactor", "", opcodeClearInfoActor, opcodeClearInfoActorExplicit); extensions.registerInstruction("clearinfoactor", "", opcodeClearInfoActor, opcodeClearInfoActorExplicit);
} }
} }