Merge pull request #92 from fedddddd/dependabot/submodules/deps/GSL-b39e7e4

Bump deps/GSL from `f1a494c` to `b39e7e4`

deps/GSL

@@ -1 +1 @@
-Subproject commit e64c97fc2cfc11992098bb38eda932de275e3f4d
+Subproject commit b39e7e4b0987859f5b19ff7686b149c916588658

deps/json

@@ -1 +1 @@
-Subproject commit 3780b41dd070436f3f55327b0a88f27a52e2dfa8
+Subproject commit 0457de21cffb298c22b629e538036bfeb96130b7

deps/zlib

@@ -1 +1 @@
-Subproject commit 643e17b7498d12ab8d15565662880579692f769d
+Subproject commit 5c42a230b7b468dff011f444161c0145b5efae59

src/component/gsc.cpp

@@ -248,16 +248,21 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_function& func)
 		{
-			try
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
+			
+			if (ctx->func_exists(name))
 			{
-				const auto index = function_map_start++;
+				printf("[iw5-gsc-utils] Warning: function '%s' already defined\n", name.data());
-				functions[index] = func;
+				index = ctx->func_id(name);
-				(*game::plutonium::gsc_ctx)->func_add(name, index);
 			}
-			catch (const std::exception& e)
+			else
 			{
-				printf("[iw5-gsc-utils] failed to add function \"%s\": %s\n", name.data(), e.what());
+				index = function_map_start++;
+				ctx->func_add(name, index);
 			}
+
+			functions.insert(std::make_pair(index, func));
 		}
 	}
 
@@ -265,16 +270,21 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_method& func)
 		{
-			try
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
+
+			if (ctx->meth_exists(name))
 			{
-				const auto index = method_map_start++;
+				printf("[iw5-gsc-utils] Warning: method '%s' already defined\n", name.data());
-				methods[index] = func;
+				index = ctx->meth_id(name);
-				(*game::plutonium::gsc_ctx)->meth_add(name, index);
 			}
-			catch (const std::exception& e)
+			else
 			{
-				printf("[iw5-gsc-utils] failed to add method \"%s\": %s\n", name.data(), e.what());
+				index = method_map_start++;
+				ctx->meth_add(name, index);
 			}
+
+			methods.insert(std::make_pair(index, func));
 		}
 	}
 

src/component/signatures.cpp

@@ -35,11 +35,18 @@ namespace signatures
 		const auto base = reinterpret_cast<size_t>(GetModuleHandle("plutonium-bootstrapper-win32.exe"));
 		utils::hook::signature signature(base, get_image_size() - base);
 
+		auto found = false;
 		signature.add({
 			string,
 			mask,
 			[&](char* address)
 			{
+				if (found)
+				{
+					return;
+				}
+
+				found = true;
 				string_ptr = address;
 			}
 		});
@@ -70,7 +77,6 @@ namespace signatures
 		}
 		
 		const auto gsc_ctx_ptr = *reinterpret_cast<size_t*>(string_ref - 0xAD);
-		OutputDebugString(utils::string::va("string_ref: %p\n", string_ref));
 		OutputDebugString(utils::string::va("gsc_ctx_ptr: %p\n", gsc_ctx_ptr));
 		game::plutonium::gsc_ctx.set(gsc_ctx_ptr);
 		return true;