mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Add explicit variant of Journal

Browse Source
This commit is contained in:
Capostrophic 2019-03-05 20:47:05 +03:00
parent cb29dc7b85
commit 59f7df187d
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwscript/dialogueextensions.cpp
View File

@ -285,6 +285,7 @@ namespace MWScript
void installOpcodes (Interpreter::Interpreter& interpreter)
{
interpreter.installSegment5 (Compiler::Dialogue::opcodeJournal, new OpJournal<ImplicitRef>);
interpreter.installSegment5 (Compiler::Dialogue::opcodeJournalExplicit, new OpJournal<ExplicitRef>);
interpreter.installSegment5 (Compiler::Dialogue::opcodeSetJournalIndex, new OpSetJournalIndex);
interpreter.installSegment5 (Compiler::Dialogue::opcodeGetJournalIndex, new OpGetJournalIndex);
interpreter.installSegment5 (Compiler::Dialogue::opcodeAddTopic, new OpAddTopic);

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

@ -458,5 +458,6 @@ op 0x2000307: ToggleBorders, tb
op 0x2000308: ToggleNavMesh
op 0x2000309: ToggleActorsPaths
op 0x200030a: SetNavMeshNumber
op 0x200030b: Journal, explicit
opcodes 0x200030b-0x3ffffff unused
opcodes 0x200030c-0x3ffffff unused

2
components/compiler/extensions0.cpp
View File

@ -175,7 +175,7 @@ namespace Compiler
{
void registerExtensions (Extensions& extensions)
{
extensions.registerInstruction ("journal", "cl", opcodeJournal);
extensions.registerInstruction ("journal", "cl", opcodeJournal, opcodeJournalExplicit);
extensions.registerInstruction ("setjournalindex", "cl", opcodeSetJournalIndex);
extensions.registerFunction ("getjournalindex", 'l', "c", opcodeGetJournalIndex);
extensions.registerInstruction ("addtopic", "S" , opcodeAddTopic);

1
components/compiler/opcodes.hpp
View File

@ -150,6 +150,7 @@ namespace Compiler
namespace Dialogue
{
const int opcodeJournal = 0x2000133;
const int opcodeJournalExplicit = 0x200030b;
const int opcodeSetJournalIndex = 0x2000134;
const int opcodeGetJournalIndex = 0x2000135;
const int opcodeAddTopic = 0x200013a;