1

hzqst · Oct 8, 2024 · d4b1d80 · d4b1d80
1 parent dd3252a
commit d4b1d80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/fallguys/meta_api.cpp b/fallguys/meta_api.cpp
@@ -466,8 +466,8 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME /* now */,
 				auto pFound = LOCATE_FROM_SIGNATURE_FROM_FUNCTION(searchBegin, searchEnd - searchBegin, pattern);
 				if (pFound)
 				{
-					auto g_groupmask_instruction = pFound + 4;
-					auto g_groupop_instruction = pFound + 14;
+					auto g_groupmask_instruction = (char *)pFound + 4;
+					auto g_groupop_instruction = (char*)pFound + 14;
 
 					if (1)
 					{
@@ -480,7 +480,6 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME /* now */,
 						if (ctx.result)
 						{
 							pg_groupmask = (decltype(pg_groupmask))ctx.result;
-							break;
 						}
 					}
 
@@ -495,10 +494,12 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME /* now */,
 						if (ctx.result)
 						{
 							pg_groupop = (decltype(pg_groupop))ctx.result;
-							break;
 						}
 					}
 
+					if (pg_groupop)
+						break;
+
 					searchBegin = (char *)pFound + sizeof(pattern) - 1;
 				}
 				else

diff --git a/metamod/signatures_template.h b/metamod/signatures_template.h
@@ -48,7 +48,7 @@ if (!g_pfn_##name)\
 #define FILL_FROM_SIGNATURE_TY(dll, name, ty) g_pfn_##name = g_call_original_##name = (decltype(g_pfn_##name))LOCATE_FROM_SIGNATURE(dll, name##_Signature_##ty);\
 if (!g_pfn_##name)\
 {\
-	LOG_ERROR(PLID, "Failed to locate " #name " from " #dll ## " (" ## (#ty) ## ") dll !");\
+	LOG_ERROR(PLID, "Failed to locate " #name " from " #dll " dll !");\
 	return FALSE;\
 }