msg_preprocessor: make sure code is compatible to TheXTech

Author: Wohlstand

_common/qt-modules/msg_box_preview/msg_box_preview.cmake

@@ -4,6 +4,6 @@ set(MSG_BOX_PREVIEW_SRC
     ${CMAKE_CURRENT_LIST_DIR}/msg_box_preview.cpp
     ${CMAKE_CURRENT_LIST_DIR}/msg_box_preview.h
 
-    ${CMAKE_CURRENT_LIST_DIR}/msg_macros.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/msg_macros.h
+    ${CMAKE_CURRENT_LIST_DIR}/msg_preprocessor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/msg_preprocessor.h
 )

_common/qt-modules/msg_box_preview/msg_box_preview.cpp

@@ -5,7 +5,7 @@
 #include <QStack>
 
 #include "msg_box_preview.h"
-#include "msg_macros.h"
+#include "msg_preprocessor.h"
 
 
 QString MsgBoxPreview::runPreProcessor()

…t-modules/msg_box_preview/msg_macros.cpp …les/msg_box_preview/msg_preprocessor.cpp_common/qt-modules/msg_box_preview/msg_macros.cpp renamed to _common/qt-modules/msg_box_preview/msg_preprocessor.cpp _common/qt-modules/msg_box_preview/msg_macros.cpp renamed to _common/qt-modules/msg_box_preview/msg_preprocessor.cpp

@@ -20,7 +20,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
-#include "msg_macros.h"
+#include "msg_preprocessor.h"
 
 #ifndef MOONDUST_UNIT_TEST
 static
@@ -287,6 +287,7 @@ static CondLineTail replace_newline(CondCmd cmd)
     }
 }
 
+
 void msgMacroProcess(const std::string &in, std::string &ret, int macro_player, int macro_state)
 {
     struct State
@@ -414,3 +415,11 @@ void msgMacroProcess(const std::string &in, std::string &ret, int macro_player,
         }
     } while(end < in.size() - 1);
 }
+
+
+void preProcessMessage(std::string &text, int macro_player, int macro_state)
+{
+    std::string ret;
+    msgMacroProcess(text, ret, macro_player, macro_state);
+    text = ret;
+}

…/qt-modules/msg_box_preview/msg_macros.h …dules/msg_box_preview/msg_preprocessor.h_common/qt-modules/msg_box_preview/msg_macros.h renamed to _common/qt-modules/msg_box_preview/msg_preprocessor.h _common/qt-modules/msg_box_preview/msg_macros.h renamed to _common/qt-modules/msg_box_preview/msg_preprocessor.h

@@ -30,6 +30,21 @@
 extern bool msgMacroParseTokens(const std::string &line, std::vector<std::string> &tokens);
 #endif
 
+/**
+ * @brief Pre-Process the message (apply conditions, or place player names where is possible)
+ * @param in Input text to pre-process
+ * @param out Output of the result
+ * @param macro_player The player number who triggered this message box, or -1 to heuristically detect somebody.
+ * @param macro_state The player's state number that is set or -1 to heuristically detect something.
+ */
 extern void msgMacroProcess(const std::string &in, std::string &out, int macro_player, int macro_state);
 
+/**
+ * @brief Pre-Process the message (apply conditions, or place player names where is possible)
+ * @param text Input-Output text to pre-process
+ * @param playerWho The player number who triggered this message box, or -1 to heuristically detect somebody.
+ * @param stateWhich The player's state number that is set or -1 to heuristically detect something.
+ */
+extern void preProcessMessage(std::string &text, int macro_player, int macro_state);
+
 #endif // MSGMACROS_H

test/Editor/msg_macros/main.cpp

@@ -2,7 +2,7 @@
 #include <QtDebug>
 #include <QVector>
 
-#include "msg_macros.h"
+#include "msg_preprocessor.h"
 
 void testTokensList(const std::string &line)
 {

test/Editor/msg_macros/msg_macros.pro

@@ -11,8 +11,8 @@ DEFINES += MOONDUST_UNIT_TEST
 INCLUDEPATH += ../../../_common/qt-modules/msg_box_preview/
 
 HEADERS += \
-        ../../../_common/qt-modules/msg_box_preview/msg_macros.h
+        ../../../_common/qt-modules/msg_box_preview/msg_preprocessor.h
 
 SOURCES += \
         main.cpp \
-        ../../../_common/qt-modules/msg_box_preview/msg_macros.cpp
+        ../../../_common/qt-modules/msg_box_preview/msg_preprocessor.cpp