Small refactor

untrustedmodders · Jun 18, 2024 · cbbeaac · cbbeaac
1 parent d916eb2
commit cbbeaac
Show file tree

Hide file tree

Showing 7 changed files with 552 additions and 550 deletions.
diff --git a/src/glue.cpp b/src/glue.cpp
@@ -15,17 +15,17 @@ static MonoString* Core_GetBaseDirectory() {
 }
 
 static bool Core_IsModuleLoaded(MonoString* name, int version, bool minimum) {
-	auto requiredVersion = version != INT_MAX ? std::make_optional(version) : std::nullopt;
-	return g_monolm.GetProvider()->IsModuleLoaded(utils::MonoStringToUTF8(name), requiredVersion, minimum);
+	auto requiredVersion = (version >= 0 && version != INT_MAX) ? std::make_optional(version) : std::nullopt;
+	return g_monolm.GetProvider()->IsModuleLoaded(MonoStringToUTF8(name), requiredVersion, minimum);
 }
 
 static bool Core_IsPluginLoaded(MonoString* name, int version, bool minimum) {
-	auto requiredVersion = version != INT_MAX ? std::make_optional(version) : std::nullopt;
-	return g_monolm.GetProvider()->IsPluginLoaded(utils::MonoStringToUTF8(name), requiredVersion, minimum);
+	auto requiredVersion = (version >= 0 && version != INT_MAX) ? std::make_optional(version) : std::nullopt;
+	return g_monolm.GetProvider()->IsPluginLoaded(MonoStringToUTF8(name), requiredVersion, minimum);
 }
 
 static MonoObject* Plugin_FindPluginByName(MonoString* name) {
-	ScriptOpt script = g_monolm.FindScript(utils::MonoStringToUTF8(name));
+	ScriptOpt script = g_monolm.FindScript(MonoStringToUTF8(name));
 	return script.has_value() ? script->get().GetManagedObject() : nullptr;
 }
 

diff --git a/src/glue.h b/src/glue.h
@@ -3,6 +3,8 @@
 namespace monolm {
 	class Glue {
 	public:
+		Glue() = delete;
+
 		static void RegisterFunctions();
 	};
 }