add more prs

1 files changed, 41 insertions, 0 deletions

diff --git a/NorthstarDLL/modmanager.cpp b/NorthstarDLL/modmanager.cpp
index 76280ef9..8ba883a3 100644
--- a/NorthstarDLL/modmanager.cpp
+++ b/NorthstarDLL/modmanager.cpp
@@ -231,6 +231,26 @@ Mod::Mod(fs::path modDir, char* jsonBuf)
 		}
 	}
 
+	if (modJson.HasMember("Dependencies") && modJson["Dependencies"].IsObject())
+	{
+		for (auto v = modJson["Dependencies"].MemberBegin(); v != modJson["Dependencies"].MemberEnd(); v++)
+		{
+			if (!v->name.IsString() || !v->value.IsString())
+				continue;
+
+			spdlog::info("Constant {} defined by {} for mod {}", v->name.GetString(), Name, v->value.GetString());
+			if (DependencyConstants.find(v->name.GetString()) != DependencyConstants.end() &&
+				v->value.GetString() != DependencyConstants[v->name.GetString()])
+			{
+				spdlog::error("A dependency constant with the same name already exists for another mod. Change the constant name.");
+				return;
+			}
+
+			if (DependencyConstants.find(v->name.GetString()) == DependencyConstants.end())
+				DependencyConstants.emplace(v->name.GetString(), v->value.GetString());
+		}
+	}
+
 	m_bWasReadSuccessfully = true;
 }
 
@@ -257,6 +277,8 @@ void ModManager::LoadMods()
 	fs::remove_all(GetCompiledAssetsPath());
 	fs::create_directories(GetModFolderPath());
 
+	m_DependencyConstants.clear();
+
 	// read enabled mods cfg
 	std::ifstream enabledModsStream(GetNorthstarPrefix() + "/enabledmods.json");
 	std::stringstream enabledModsStringStream;
@@ -298,6 +320,19 @@ void ModManager::LoadMods()
 
 		Mod mod(modDir, (char*)jsonStringStream.str().c_str());
 
+		
+		for (auto& pair : mod.DependencyConstants)
+		{
+			if (m_DependencyConstants.find(pair.first) != m_DependencyConstants.end() && m_DependencyConstants[pair.first] != pair.second)
+			{
+				spdlog::error("Constant {} in mod {} already exists in another mod.", pair.first, mod.Name);
+				mod.m_bWasReadSuccessfully = false;
+				break;
+			}
+			if (m_DependencyConstants.find(pair.first) == m_DependencyConstants.end())
+				m_DependencyConstants.emplace(pair);
+		}
+
 		if (m_bHasEnabledModsCfg && m_EnabledModsCfg.HasMember(mod.Name.c_str()))
 			mod.m_bEnabled = m_EnabledModsCfg[mod.Name.c_str()].IsTrue();
 		else
@@ -428,6 +463,12 @@ void ModManager::LoadMods()
 					modPak.m_bAutoLoad =
 						!bUseRpakJson || (dRpakJson.HasMember("Preload") && dRpakJson["Preload"].IsObject() &&
 										  dRpakJson["Preload"].HasMember(pakName) && dRpakJson["Preload"][pakName].IsTrue());
+
+					// postload things
+					if (!bUseRpakJson ||
+						(dRpakJson.HasMember("Postload") && dRpakJson["Postload"].IsObject() && dRpakJson["Postload"].HasMember(pakName)))
+						modPak.m_sLoadAfterPak = dRpakJson["Postload"][pakName].GetString();
+
 					modPak.m_sPakName = pakName;
 
 					// not using atm because we need to resolve path to rpak