From 3e2eed92695405eae7372cf64fea18acd0af7abe Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 27 May 2014 15:23:22 +0200
Subject: [PATCH] Implement getFactionReaction function

Strange bug when using value != 0 for the garbage argument?
---
 apps/openmw/mwscript/dialogueextensions.cpp | 22 +++++++++++++++++++++
 apps/openmw/mwscript/docs/vmformat.txt      |  3 ++-
 components/compiler/extensions0.cpp         |  1 +
 components/compiler/opcodes.hpp             |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index 19f6ca2df..9dde65ab2 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -215,6 +215,27 @@ namespace MWScript
             }
         };
 
+        class OpGetFactionReaction : public Interpreter::Opcode0
+        {
+        public:
+
+            virtual void execute (Interpreter::Runtime& runtime)
+            {
+                std::string faction1 = runtime.getStringLiteral (runtime[0].mInteger);
+                runtime.pop();
+
+                std::string faction2 = runtime.getStringLiteral (runtime[0].mInteger);
+                runtime.pop();
+
+                // ignore extra garbage argument
+                runtime.pop();
+
+                runtime.push(MWBase::Environment::get().getDialogueManager()
+                             ->getFactionReaction(faction1, faction2));
+            }
+        };
+
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5 (Compiler::Dialogue::opcodeJournal, new OpJournal);
@@ -234,6 +255,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Dialogue::opcodeSameFaction, new OpSameFaction<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Dialogue::opcodeSameFactionExplicit, new OpSameFaction<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Dialogue::opcodeModFactionReaction, new OpModFactionReaction);
+            interpreter.installSegment5 (Compiler::Dialogue::opcodeGetFactionReaction, new OpGetFactionReaction);
         }
     }
 
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index f81cfb460..53c80a943 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -391,5 +391,6 @@ op 0x200023f: GetPcTraveling
 op 0x2000240: onKnockout
 op 0x2000241: onKnockoutExplicit
 op 0x2000242: ModFactionReaction
+op 0x2000243: GetFactionReaction
 
-opcodes 0x2000243-0x3ffffff unused
+opcodes 0x2000244-0x3ffffff unused
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 24e875173..4ef638ef8 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -180,6 +180,7 @@ namespace Compiler
             extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction,
                 opcodeSameFactionExplicit);
             extensions.registerInstruction("modfactionreaction", "ccl", opcodeModFactionReaction);
+            extensions.registerFunction("getfactionreaction", 'l', "ccl", opcodeGetFactionReaction);
         }
     }
 
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 381a052ac..1dff04665 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -153,6 +153,7 @@ namespace Compiler
         const int opcodeSameFaction = 0x20001b5;
         const int opcodeSameFactionExplicit = 0x20001b6;
         const int opcodeModFactionReaction = 0x2000242;
+        const int opcodeGetFactionReaction = 0x2000243;
     }
 
     namespace Gui