mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 21:09:41 +00:00
Code Issues Releases Wiki Activity

Add explicit variant of 'OnActivate'

Browse source
This commit is contained in:
scrawl 2017-10-24 00:40:17 +02:00
parent e564dd842e
commit 0c6ef17fb5
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -453,5 +453,6 @@ op 0x2000302: Fixme
op 0x2000303: Fixme, explicit op 0x2000303: Fixme, explicit
op 0x2000304: Show op 0x2000304: Show
op 0x2000305: Show, explicit op 0x2000305: Show, explicit
op 0x2000306: OnActivate, explicit
opcodes 0x2000304-0x3ffffff unused opcodes 0x2000307-0x3ffffff unused

9
apps/openmw/mwscript/miscextensions.cpp
View file

@ -131,16 +131,14 @@ namespace MWScript
} }
}; };
template <class R>
class OpOnActivate : public Interpreter::Opcode0 class OpOnActivate : public Interpreter::Opcode0
{ {
public: public:
virtual void execute (Interpreter::Runtime& runtime) virtual void execute (Interpreter::Runtime& runtime)
{ {
InterpreterContext& context = MWWorld::Ptr ptr = R()(runtime);
static_cast<InterpreterContext&> (runtime.getContext());
MWWorld::Ptr ptr = context.getReference();
runtime.push (ptr.getRefData().onActivate()); runtime.push (ptr.getRefData().onActivate());
} }
@ -1280,7 +1278,8 @@ namespace MWScript
void installOpcodes (Interpreter::Interpreter& interpreter) void installOpcodes (Interpreter::Interpreter& interpreter)
{ {
interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox); interpreter.installSegment5 (Compiler::Misc::opcodeXBox, new OpXBox);
interpreter.installSegment5 (Compiler::Misc::opcodeOnActivate, new OpOnActivate); interpreter.installSegment5 (Compiler::Misc::opcodeOnActivate, new OpOnActivate<ImplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeOnActivateExplicit, new OpOnActivate<ExplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeActivate, new OpActivate<ImplicitRef>); interpreter.installSegment5 (Compiler::Misc::opcodeActivate, new OpActivate<ImplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeActivateExplicit, new OpActivate<ExplicitRef>); interpreter.installSegment5 (Compiler::Misc::opcodeActivateExplicit, new OpActivate<ExplicitRef>);
interpreter.installSegment3 (Compiler::Misc::opcodeLock, new OpLock<ImplicitRef>); interpreter.installSegment3 (Compiler::Misc::opcodeLock, new OpLock<ImplicitRef>);

2
components/compiler/extensions0.cpp
View file

@ -240,7 +240,7 @@ namespace Compiler
void registerExtensions (Extensions& extensions) void registerExtensions (Extensions& extensions)
{ {
extensions.registerFunction ("xbox", 'l', "", opcodeXBox); extensions.registerFunction ("xbox", 'l', "", opcodeXBox);
extensions.registerFunction ("onactivate", 'l', "", opcodeOnActivate); extensions.registerFunction ("onactivate", 'l', "", opcodeOnActivate, opcodeOnActivateExplicit);
extensions.registerInstruction ("activate", "x", opcodeActivate, opcodeActivateExplicit); extensions.registerInstruction ("activate", "x", opcodeActivate, opcodeActivateExplicit);
extensions.registerInstruction ("lock", "/l", opcodeLock, opcodeLockExplicit); extensions.registerInstruction ("lock", "/l", opcodeLock, opcodeLockExplicit);
extensions.registerInstruction ("unlock", "", opcodeUnlock, opcodeUnlockExplicit); extensions.registerInstruction ("unlock", "", opcodeUnlock, opcodeUnlockExplicit);

1
components/compiler/opcodes.hpp
View file

@ -200,6 +200,7 @@ namespace Compiler
{ {
const int opcodeXBox = 0x200000c; const int opcodeXBox = 0x200000c;
const int opcodeOnActivate = 0x200000d; const int opcodeOnActivate = 0x200000d;
const int opcodeOnActivateExplicit = 0x2000306;
const int opcodeActivate = 0x2000075; const int opcodeActivate = 0x2000075;
const int opcodeActivateExplicit = 0x2000244; const int opcodeActivateExplicit = 0x2000244;
const int opcodeLock = 0x20004; const int opcodeLock = 0x20004;