Fix missing var "sv_areanodes" in fallguys.so init procedure, which w…

…as leading to crash under linux.
hzqst · Feb 21, 2023 · 7fec72f · 7fec72f
1 parent 5d96572
commit 7fec72f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/fallguys/engine_hook.cpp b/fallguys/engine_hook.cpp
@@ -88,7 +88,7 @@ void SV_ClipToLinksEx(areanode_t *node, moveclip_t *clip)
 
 		if (pg_groupop)
 		{
-			if (touch->v.groupinfo != 0 && (clip->passedict && clip->passedict->v.groupinfo != 0))
+			if (touch->v.groupinfo != 0 && clip->passedict && clip->passedict->v.groupinfo != 0)
 			{
 				if ((*pg_groupop) == GROUP_OP_AND && (touch->v.groupinfo & clip->passedict->v.groupinfo) == 0)
 					continue;
@@ -104,7 +104,7 @@ void SV_ClipToLinksEx(areanode_t *node, moveclip_t *clip)
 		if (touch == clip->passedict)
 			continue;
 
-		if (gpNewDllFunctionsTable->pfnShouldCollide)
+		if (gpNewDllFunctionsTable && gpNewDllFunctionsTable->pfnShouldCollide)
 		{
 			if (gpNewDllFunctionsTable->pfnShouldCollide(touch, clip->passedict) == 0)
 				continue;

diff --git a/fallguys/meta_api.cpp b/fallguys/meta_api.cpp
@@ -187,6 +187,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME /* now */,
 #ifdef _WIN32
 
 	VAR_FROM_SIGNATURE_FROM_START(engine, sv_models, 13);
+
 	VAR_FROM_SIGNATURE_FROM_END(engine, host_frametime, 0);
 	VAR_FROM_SIGNATURE_FROM_END(engine, pmovevars, 0);
 	VAR_FROM_SIGNATURE_FROM_START(engine, sv_areanodes, 9);
@@ -204,6 +205,8 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME /* now */,
 
 	VAR_FROM_SIGNATURE(engine, host_frametime);
 	VAR_FROM_SIGNATURE(engine, pmovevars);
+	VAR_FROM_SIGNATURE(engine, sv_areanodes);
+
 	VAR_FROM_SIGNATURE(engine, pg_groupop);
 	VAR_FROM_SIGNATURE(engine, pg_groupmask);