Skip to content

Commit

Permalink
add engine_i686.so support
Browse files Browse the repository at this point in the history
  • Loading branch information
@hzqst
hzqst committed Oct 8, 2024
1 parent deb2f9e commit 962e5fa
Show file tree
Hide file tree
Showing 13 changed files with 436 additions and 66 deletions.
12 changes: 4 additions & 8 deletions asext/meta_api.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,16 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME /* now */,
LOG_MESSAGE(PLID, "SCServerDLL003 found! Using signatures for Sven Co-op 5.16");

FILL_FROM_SIGNATURED_CALLER_FROM_END(server, CASHook_CASHook, -1);

LOG_MESSAGE(PLID, "222");
LOG_MESSAGE(PLID, "CASHook_CASHook found at %p", g_pfn_CASHook_CASHook);

FILL_FROM_SIGNATURE(server, CASHook_Call);

LOG_MESSAGE(PLID, "333");
LOG_MESSAGE(PLID, "CASHook_Call found at %p", g_pfn_CASHook_Call);

FILL_FROM_SIGNATURED_CALLER_FROM_END(server, CString_Assign, -1);

LOG_MESSAGE(PLID, "444");
LOG_MESSAGE(PLID, "CString_Assign found at %p", g_pfn_CString_Assign);

FILL_FROM_SIGNATURE(server, CString_dtor);

LOG_MESSAGE(PLID, "555");
LOG_MESSAGE(PLID, "CString_dtor found at %p", g_pfn_CString_dtor);

FILL_FROM_SIGNATURED_CALLER_FROM_END(server, CASDocumentation_RegisterObjectType, -1);
LOG_MESSAGE(PLID, "CASDocumentation_RegisterObjectType found at %p", g_pfn_CASDocumentation_RegisterObjectType);
Expand Down
1 change: 0 additions & 1 deletion asext/signatures.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#define CASHook_CASHook_Signature "\xC7\x44\x24\x2A\x03\x00\x00\x00\xC7\x44\x24\x2A\x02\x00\x00\x00\x8D\x2A\x2A\x2A\x2A\x2A\x89\x0C\x2A\xE8"
#define CASHook_CASHook_Symbol "_ZN7CASHookC2EhhPKcS1_S1_RK16CASHookArguments"


#define CASHook_Call_Signature "\x83\xEC\x1C\x8D\x44\x24\x28\x89\x44\x24\x0C\x8B\x54\x24\x24\x89\x54\x24\x08\xC7\x44\x24\x04\x00\x00\x00\x00"
#define CASHook_Call_Symbol "_ZN7CASHook4CallEiz"

Expand Down
1 change: 1 addition & 0 deletions fallguys/Config.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ SRCFILES = dllapi.cpp engine_api.cpp engine_hook.cpp fallguys.cpp h_export.cpp m
INCLUDEDIRS+=-I$(SDKSRC)/../asext/include
INCLUDEDIRS+=-I$(SDKSRC)/../thirdparty/fmod
INCLUDEDIRS+=-I$(SDKSRC)/../thirdparty/install/bullet3/$(OBJDIR_LINUX)/include/bullet
INCLUDEDIRS+=-I$(SDKSRC)/../thirdparty/install/capstone/$(OBJDIR_LINUX)/include
EXTRA_CFLAGS+=-DPLATFORM_POSIX
EXTRA_LINK+=-L$(SDKSRC)/../thirdparty/install/bullet3/$(OBJDIR_LINUX)/lib
EXTRA_LINK+=-Wl,--whole-archive -lBullet3Dynamics -lBullet3Collision -lBullet3Common -lBullet3Geometry -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -Wl,--no-whole-archive
8 changes: 3 additions & 5 deletions fallguys/engine_hook.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,8 @@ void SV_SingleClipMoveToEntity_10152(edict_t* ent, const vec3_t& start, const ve
{
return g_call_original_SV_SingleClipMoveToEntity_10152(ent, start, mins, maxs, end, trace, passedict);
}
else if (g_call_original_SV_SingleClipMoveToEntity)
{
return g_call_original_SV_SingleClipMoveToEntity(ent, start, mins, maxs, end, trace);
}

return g_call_original_SV_SingleClipMoveToEntity(ent, start, mins, maxs, end, trace);
}

void SV_ClipToLinksEx(areanode_t *node, moveclip_t *clip)
Expand Down Expand Up @@ -213,7 +211,7 @@ void SV_ClipToLinksEx(areanode_t *node, moveclip_t *clip)
if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0])
continue; // points never interact

// might intersect, so do an exact clip
// might intersect, so do an exact clip
if (clip->trace.allsolid)
return;

Expand Down
6 changes: 3 additions & 3 deletions fallguys/enginedef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ typedef edict_t *(*fnSV_TestEntityPosition)(edict_t *ent);
edict_t *SV_TestEntityPositionEx(edict_t *ent);
PRIVATE_FUNCTION_EXTERN(SV_TestEntityPosition);

typedef void(*fnSV_LinkEdict)(edict_t *ent, qboolean touch_triggers);
void SV_LinkEdict(edict_t *ent, qboolean touch_triggers);
PRIVATE_FUNCTION_EXTERN(SV_LinkEdict);
//typedef void(*fnSV_LinkEdict)(edict_t *ent, qboolean touch_triggers);
//void SV_LinkEdict(edict_t *ent, qboolean touch_triggers);
//PRIVATE_FUNCTION_EXTERN(SV_LinkEdict);

typedef void(*fnSV_SingleClipMoveToEntity)(edict_t *ent, const vec3_t& start, const vec3_t& mins, const vec3_t& maxs, const vec3_t& end, trace_t *trace);
void SV_SingleClipMoveToEntity(edict_t *ent, const vec3_t& start, const vec3_t& mins, const vec3_t& maxs, const vec3_t& end, trace_t *trace);
Expand Down
4 changes: 2 additions & 2 deletions fallguys/fallguys.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;FALLGUYS_EXPORTS;_WINDOWS;_USRDLL;PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)hlsdk\common;$(SolutionDir)hlsdk\dlls;$(SolutionDir)hlsdk\pm_shared;$(SolutionDir)hlsdk\engine;$(SolutionDir)metamod;$(SolutionDir)asext\include;$(SolutionDir)thirdparty\fmod;$(Bullet3IncludeDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)hlsdk\common;$(SolutionDir)hlsdk\dlls;$(SolutionDir)hlsdk\pm_shared;$(SolutionDir)hlsdk\engine;$(SolutionDir)metamod;$(SolutionDir)asext\include;$(SolutionDir)thirdparty\fmod;$(Bullet3IncludeDirectory);$(CapstoneIncludeDirectory)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
Expand All @@ -87,7 +87,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;FALLGUYS_EXPORTS;_WINDOWS;_USRDLL;PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)hlsdk\common;$(SolutionDir)hlsdk\dlls;$(SolutionDir)hlsdk\pm_shared;$(SolutionDir)hlsdk\engine;$(SolutionDir)metamod;$(SolutionDir)asext\include;$(SolutionDir)thirdparty\fmod;$(Bullet3IncludeDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)hlsdk\common;$(SolutionDir)hlsdk\dlls;$(SolutionDir)hlsdk\pm_shared;$(SolutionDir)hlsdk\engine;$(SolutionDir)metamod;$(SolutionDir)asext\include;$(SolutionDir)thirdparty\fmod;$(Bullet3IncludeDirectory);$(CapstoneIncludeDirectory)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
Expand Down
Loading

0 comments on commit 962e5fa

Please sign in to comment.