Fixes for update

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/io.cpp

@@ -179,4 +179,4 @@ namespace io
 	};
 }
 
-REGISTER_COMPONENT(io::component)
+REGISTER_COMPONENT(io::component)

src/component/json.cpp

@@ -194,4 +194,4 @@ namespace json
 	};
 }
 
-REGISTER_COMPONENT(json::component)
+REGISTER_COMPONENT(json::component)

src/component/notifies.cpp

@@ -71,4 +71,4 @@ namespace notifies
 	};
 }
 
-REGISTER_COMPONENT(notifies::component)
+REGISTER_COMPONENT(notifies::component)

src/component/scripting.cpp

@@ -136,4 +136,4 @@ namespace scripting
 	};
 }
 
-REGISTER_COMPONENT(scripting::component)
+REGISTER_COMPONENT(scripting::component)

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;

src/component/userinfo.cpp

@@ -193,4 +193,4 @@ namespace userinfo
 	};
 }
 
-REGISTER_COMPONENT(userinfo::component)
+REGISTER_COMPONENT(userinfo::component)