Merge branch 'scriptstuff'

src/Image.cpp

@@ -37,6 +37,10 @@ Image::Image()
         spdlog::info("\tResolved to version: 1.04");
         version = MakeVersion(1,4);
         break;
+    case 0x20F87F01:
+        spdlog::info("\tResolved to version: 1.05");
+        version = MakeVersion(1, 5);
+        break;
     default:
         spdlog::error("\tUnknown version, please update the mod");
         break;

src/Pattern.cpp

@@ -1,6 +1,8 @@
 #include "Pattern.h"
 #include <spdlog/spdlog.h>
 
+#include "Options.h"
+
 bool CompareByteArray(uint8_t* Data, const std::vector<uint8_t>& aSignature)
 {
     uint8_t* pData = Data;
@@ -43,3 +45,8 @@ uint8_t* FindSignature(uint8_t* apStart, uint8_t* apEnd, std::vector<uint8_t> aS
 
     return nullptr;
 }
+
+uint8_t* FindSignature(std::vector<uint8_t> aSignature) noexcept
+{
+    return FindSignature(Options::Get().GameImage.pTextStart, Options::Get().GameImage.pTextEnd, std::move(aSignature));
+}

src/Pattern.h

@@ -3,4 +3,5 @@
 #include <cstdint>
 #include <vector>
 
-uint8_t* FindSignature(uint8_t* apStart, uint8_t* apEnd, std::vector<uint8_t> apSignature) noexcept;
+uint8_t* FindSignature(uint8_t* apStart, uint8_t* apEnd, std::vector<uint8_t> apSignature) noexcept;
+uint8_t* FindSignature(std::vector<uint8_t> aSignature) noexcept;

src/Utils.cpp

@@ -0,0 +1,21 @@
+#include "Utils.h"
+
+void ltrim(std::string& s)
+{
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
+        return !std::isspace(ch);
+        }));
+}
+
+void rtrim(std::string& s)
+{
+    s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
+        return !std::isspace(ch);
+        }).base(), s.end());
+}
+
+void trim(std::string& s)
+{
+    ltrim(s);
+    rtrim(s);
+}

src/Utils.h

@@ -0,0 +1,5 @@
+#include <string>
+
+void ltrim(std::string& s);
+void rtrim(std::string& s);
+void trim(std::string& s);

src/disable_boundary_teleport.cpp

@@ -1,7 +1,6 @@
 #include <windows.h>
 #include "Image.h"
 #include <spdlog/spdlog.h>
-#include "REDString.h"
 #include "Pattern.h"
 
 void DisableBoundaryTeleportPatch(Image* apImage)

src/disable_intro_movies.cpp

@@ -1,9 +1,8 @@
-#include <windows.h>
 #include <MinHook.h>
 #include "Image.h"
 #include <spdlog/spdlog.h>
-#include "REDString.h"
 #include "Pattern.h"
+#include "reverse/REDString.h"
 
 using TInitScriptMemberVariable = void*(void* a1, void* a2, uint64_t a3, uint64_t nameHash, void* a5, void* a6, void* a7);
 TInitScriptMemberVariable* RealInitScriptMemberVariable = nullptr;

src/disable_vignette.cpp

@@ -1,7 +1,6 @@
 #include <windows.h>
 #include "Image.h"
 #include <spdlog/spdlog.h>
-#include "REDString.h"
 #include "Pattern.h"
 
 void DisableVignettePatch(Image* apImage)

src/enable_debug.cpp

@@ -1,8 +1,8 @@
 #include "Image.h"
 #include <spdlog/spdlog.h>
 #include <MinHook.h>
-#include "REDString.h"
 #include "Pattern.h"
+#include "reverse/REDString.h"
 
 using ScriptExecutionPointer = uint64_t;