mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 08:23:51 +00:00
Code Issues Releases Wiki Activity

SameFaction

Browse source
This commit is contained in:
scrawl 2012-11-23 20:57:08 +01:00
parent d54ed557bf
commit 9c170af30c
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@
#include "../mwbase/journal.hpp" #include "../mwbase/journal.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"
#include "../mwmechanics/npcstats.hpp" #include "../mwmechanics/npcstats.hpp"
#include "interpretercontext.hpp" #include "interpretercontext.hpp"
@ -172,6 +173,21 @@ namespace MWScript
} }
}; };
template<class R>
class OpSameFaction : public Interpreter::Opcode0
{
public:
virtual void execute (Interpreter::Runtime& runtime)
{
MWWorld::Ptr ptr = R()(runtime);
MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer();
runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).isSameFaction (MWWorld::Class::get(player).getNpcStats (player)));
}
};
const int opcodeJournal = 0x2000133; const int opcodeJournal = 0x2000133;
const int opcodeSetJournalIndex = 0x2000134; const int opcodeSetJournalIndex = 0x2000134;
const int opcodeGetJournalIndex = 0x2000135; const int opcodeGetJournalIndex = 0x2000135;
@ -186,6 +202,8 @@ namespace MWScript
const int opcodeModReputationExplicit = 0x20001b0; const int opcodeModReputationExplicit = 0x20001b0;
const int opcodeGetReputation = 0x20001b1; const int opcodeGetReputation = 0x20001b1;
const int opcodeGetReputationExplicit = 0x20001b2; const int opcodeGetReputationExplicit = 0x20001b2;
const int opcodeSameFaction = 0x20001b5;
const int opcodeSameFactionExplicit = 0x20001b6;
void registerExtensions (Compiler::Extensions& extensions) void registerExtensions (Compiler::Extensions& extensions)
{ {
@ -204,6 +222,8 @@ namespace MWScript
opcodeModReputationExplicit); opcodeModReputationExplicit);
extensions.registerFunction("getreputation", 'l', "", opcodeGetReputation, extensions.registerFunction("getreputation", 'l', "", opcodeGetReputation,
opcodeGetReputationExplicit); opcodeGetReputationExplicit);
extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction,
opcodeSameFactionExplicit);
} }
void installOpcodes (Interpreter::Interpreter& interpreter) void installOpcodes (Interpreter::Interpreter& interpreter)
@ -222,6 +242,8 @@ namespace MWScript
interpreter.installSegment5 (opcodeSetReputationExplicit, new OpSetReputation<ExplicitRef>); interpreter.installSegment5 (opcodeSetReputationExplicit, new OpSetReputation<ExplicitRef>);
interpreter.installSegment5 (opcodeModReputationExplicit, new OpModReputation<ExplicitRef>); interpreter.installSegment5 (opcodeModReputationExplicit, new OpModReputation<ExplicitRef>);
interpreter.installSegment5 (opcodeGetReputationExplicit, new OpGetReputation<ExplicitRef>); interpreter.installSegment5 (opcodeGetReputationExplicit, new OpGetReputation<ExplicitRef>);
interpreter.installSegment5 (opcodeSameFaction, new OpSameFaction<ImplicitRef>);
interpreter.installSegment5 (opcodeSameFactionExplicit, new OpSameFaction<ExplicitRef>);
} }
} }

4
apps/openmw/mwscript/docs/vmformat.txt
View file

@ -230,5 +230,7 @@ op 0x20001b1: GetReputation
op 0x20001b2: GetReputation, explicit op 0x20001b2: GetReputation, explicit
op 0x20001b3: Equip op 0x20001b3: Equip
op 0x20001b4: Equip, explicit op 0x20001b4: Equip, explicit
opcodes 0x20001b5-0x3ffffff unused op 0x20001b5: SameFaction
op 0x20001b6: SameFaction, explicit
opcodes 0x20001b7-0x3ffffff unused