From 2ae34b67e36b8ba05132d481876eb4ed7a826283 Mon Sep 17 00:00:00 2001
From: BobTheBob9 <for.oliver.kirkham@gmail.com>
Date: Thu, 7 Jul 2022 21:31:41 +0100
Subject: almost fully replaced hooking lib

---
 NorthstarDLL/scriptsrson.cpp | 126 +++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

(limited to 'NorthstarDLL/scriptsrson.cpp')

diff --git a/NorthstarDLL/scriptsrson.cpp b/NorthstarDLL/scriptsrson.cpp
index d7df84e8..0aaab277 100644
--- a/NorthstarDLL/scriptsrson.cpp
+++ b/NorthstarDLL/scriptsrson.cpp
@@ -1,64 +1,64 @@
-#include "pch.h"
-#include "modmanager.h"
-#include "scriptsrson.h"
-#include "filesystem.h"
-#include "squirrel.h"
-
-#include <fstream>
-
-void ModManager::BuildScriptsRson()
-{
-	spdlog::info("Building custom scripts.rson");
-	fs::path MOD_SCRIPTS_RSON_PATH = fs::path(GetCompiledAssetsPath() / MOD_SCRIPTS_RSON_SUFFIX);
-	fs::remove(MOD_SCRIPTS_RSON_PATH);
-
-	std::string scriptsRson = R2::ReadVPKOriginalFile(VPK_SCRIPTS_RSON_PATH);
-	scriptsRson += "\n\n// START MODDED SCRIPT CONTENT\n\n"; // newline before we start custom stuff
-
-	for (Mod& mod : m_loadedMods)
-	{
-		if (!mod.Enabled)
-			continue;
-
-		// this isn't needed at all, just nice to have imo
-		scriptsRson += "// MOD: ";
-		scriptsRson += mod.Name;
-		scriptsRson += ":\n\n";
-
-		for (ModScript& script : mod.Scripts)
-		{
-			/* should create something with this format for each script
-			When: "CONTEXT"
-			Scripts:
-			[
-				_coolscript.gnut
-			]*/
-
-			scriptsRson += "When: \"";
-			scriptsRson += script.RsonRunOn;
-			scriptsRson += "\"\n";
-
-			scriptsRson += "Scripts:\n[\n\t";
-			scriptsRson += script.Path;
-			scriptsRson += "\n]\n\n";
-		}
-	}
-
-	fs::create_directories(MOD_SCRIPTS_RSON_PATH.parent_path());
-
-	std::ofstream writeStream(MOD_SCRIPTS_RSON_PATH, std::ios::binary);
-	writeStream << scriptsRson;
-	writeStream.close();
-
-	ModOverrideFile overrideFile;
-	overrideFile.owningMod = nullptr;
-	overrideFile.path = VPK_SCRIPTS_RSON_PATH;
-
-	if (m_modFiles.find(VPK_SCRIPTS_RSON_PATH) == m_modFiles.end())
-		m_modFiles.insert(std::make_pair(VPK_SCRIPTS_RSON_PATH, overrideFile));
-	else
-		m_modFiles[VPK_SCRIPTS_RSON_PATH] = overrideFile;
-
-	// todo: for preventing dupe scripts in scripts.rson, we could actually parse when conditions with the squirrel vm, just need a way to
-	// get a result out of squirrelmanager.ExecuteCode this would probably be the best way to do this, imo
+#include "pch.h"
+#include "modmanager.h"
+#include "scriptsrson.h"
+#include "filesystem.h"
+#include "squirrel.h"
+
+#include <fstream>
+
+void ModManager::BuildScriptsRson()
+{
+	spdlog::info("Building custom scripts.rson");
+	fs::path MOD_SCRIPTS_RSON_PATH = fs::path(GetCompiledAssetsPath() / MOD_SCRIPTS_RSON_SUFFIX);
+	fs::remove(MOD_SCRIPTS_RSON_PATH);
+
+	std::string scriptsRson = R2::ReadVPKOriginalFile(VPK_SCRIPTS_RSON_PATH);
+	scriptsRson += "\n\n// START MODDED SCRIPT CONTENT\n\n"; // newline before we start custom stuff
+
+	for (Mod& mod : m_LoadedMods)
+	{
+		if (!mod.m_bEnabled)
+			continue;
+
+		// this isn't needed at all, just nice to have imo
+		scriptsRson += "// MOD: ";
+		scriptsRson += mod.Name;
+		scriptsRson += ":\n\n";
+
+		for (ModScript& script : mod.Scripts)
+		{
+			/* should create something with this format for each script
+			When: "CONTEXT"
+			Scripts:
+			[
+				_coolscript.gnut
+			]*/
+
+			scriptsRson += "When: \"";
+			scriptsRson += script.RunOn;
+			scriptsRson += "\"\n";
+
+			scriptsRson += "Scripts:\n[\n\t";
+			scriptsRson += script.Path;
+			scriptsRson += "\n]\n\n";
+		}
+	}
+
+	fs::create_directories(MOD_SCRIPTS_RSON_PATH.parent_path());
+
+	std::ofstream writeStream(MOD_SCRIPTS_RSON_PATH, std::ios::binary);
+	writeStream << scriptsRson;
+	writeStream.close();
+
+	ModOverrideFile overrideFile;
+	overrideFile.m_pOwningMod = nullptr;
+	overrideFile.m_Path = VPK_SCRIPTS_RSON_PATH;
+
+	if (m_ModFiles.find(VPK_SCRIPTS_RSON_PATH) == m_ModFiles.end())
+		m_ModFiles.insert(std::make_pair(VPK_SCRIPTS_RSON_PATH, overrideFile));
+	else
+		m_ModFiles[VPK_SCRIPTS_RSON_PATH] = overrideFile;
+
+	// todo: for preventing dupe scripts in scripts.rson, we could actually parse when conditions with the squirrel vm, just need a way to
+	// get a result out of squirrelmanager.ExecuteCode this would probably be the best way to do this, imo
 }
\ No newline at end of file
-- 
cgit v1.2.3