Work on d_msg_object (#2186)

2 files changed, 20 insertions, 0 deletions

diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h
index 8bce73e824..f2c95d233b 100644
--- a/include/JSystem/JMessage/control.h
+++ b/include/JSystem/JMessage/control.h
@@ -28,6 +28,10 @@ struct TControl {
                                              (TProcessor*)pRenderingProcessor_;
     }
 
+    int setMessageCode(u32 code) {
+        return setMessageCode(code >> 16, code);
+    }
+
     int setMessageCode_inReset_(TProcessor* pProcessor, u16 param_1, u16 param_2) {
         if (!setMessageCode_inSequence_(pProcessor, param_1, param_2)) {
             return 0;
@@ -57,6 +61,13 @@ struct TControl {
         pResourceCache_ = NULL;
     }
 
+    void render_synchronize() {
+        if (isReady_render_()) {
+            field_0x20 = pszText_update_current_;
+            oStack_renderingProcessor_ = pRenderingProcessor_->oStack_;
+        }
+    }
+
     /* 0x04 */ TSequenceProcessor* pSequenceProcessor_;
     /* 0x08 */ TRenderingProcessor* pRenderingProcessor_;
     /* 0x0C */ u16 messageCode_;
diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h
index b636820ba7..0d55e8d00f 100644
--- a/include/JSystem/JMessage/processor.h
+++ b/include/JSystem/JMessage/processor.h
@@ -2,6 +2,7 @@
 #define JMESSAGE_PROCESSOR_H
 
 #include "JSystem/JMessage/resource.h"
+#include "algorithm.h"
 
 namespace JMessage {
 struct TResource;
@@ -63,6 +64,14 @@ struct TProcessor {
 
         void pop() { upsz_--; }
 
+        TStack_& operator=(const TStack_& other) {
+            upsz_ = other.upsz_;
+            char** start = (char**)other.stack;
+            char** end = (char**)(other.stack + other.upsz_);
+            std::copy(start, end, stack);
+            return *this;
+        }
+
         /* 0x0 */ u32 upsz_;  // stack size
         /* 0x4 */ const char* stack[4];
     };  // Size: 0x14