Skip to content

game_shared: workaround PM_PlayerTrace under e2k, where ABI breaks between C and C++ #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SNMetamorph merged 1 commit into from
May 13, 2026
Merged

game_shared: workaround PM_PlayerTrace under e2k, where ABI breaks between C and C++ #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion game_shared/pm_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "usercmd.h"
#include "material.h"

#include <string.h> // memcpy for PM_PlayerTrace hack

#define MAX_PHYSENTS 600 // Must have room for all entities in the world.
#define MAX_MOVEENTS 64
#define MAX_CLIP_PLANES 5
Expand Down Expand Up @@ -89,6 +91,30 @@ typedef struct physent_s
vec3_t vuser4;
} physent_t;

#ifdef __e2k__
typedef struct pmplane_compat_s
{
float normal[3];
float dist;
} pmplane_compat_t;

typedef struct pmtrace_compat_s
{
qboolean allsolid;
qboolean startsolid;
qboolean inopen;
qboolean inwater;
float fraction;
float endpos[3];
pmplane_compat_t plane;
int ent;
float deltavelocity[3];
int hitgroup;
} pmtrace_compat_t;

static_assert(sizeof(pmtrace_t) == sizeof(pmtrace_compat_t));
#endif // __e2k__

typedef struct playermove_s
{
int player_index; // So we don't try to run the PM_CheckStuck nudging too quickly.
Expand Down Expand Up @@ -205,8 +231,14 @@ typedef struct playermove_s
void (*PM_StuckTouch)( int hitent, pmtrace_t *ptraceresult );
int (*PM_PointContents)( float *p, int *truecontents /*filled in if this is non-null*/ );
int (*PM_TruePointContents)( float *p );
int (*PM_HullPointContents)( struct hull_s *hull, int num, float *p );
int (*PM_HullPointContents)( struct hull_s *hull, int num, float *p );

#ifdef __e2k__
pmtrace_compat_t (*PM_PlayerTraceCompat)( float *start, float *end, int traceFlags, int ignore_pe );
#else
pmtrace_t (*PM_PlayerTrace)( float *start, float *end, int traceFlags, int ignore_pe );
#endif

struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehulll, int ignore_pe );
int (*RandomLong)( int lLow, int lHigh );
float (*RandomFloat)( float flLow, float flHigh );
Expand All @@ -229,5 +261,16 @@ typedef struct playermove_s
int (*PM_TestPlayerPositionEx) (float *pos, pmtrace_t *ptrace, int (*pfnIgnore)( physent_t *pe ));
struct pmtrace_s *(*PM_TraceLineEx)( float *start, float *end, int flags, int usehulll, int (*pfnIgnore)( physent_t *pe ));
struct msurface_s *(*PM_TraceSurface)( int ground, float *vstart, float *vend );

#ifdef __e2k__
pmtrace_t PM_PlayerTrace( float *start, float *end, int traceFlags, int ignore_pe )
{
pmtrace_compat_t tr = PM_PlayerTraceCompat( start, end, traceFlags, ignore_pe );
pmtrace_t tr2;

memcpy( &tr2, &tr, sizeof( tr2 ));
return tr2;
}
#endif
} playermove_t;
#endif//PM_DEFS_H
Loading