diff --git a/engine/common/model.c b/engine/common/model.c index 6c557bee..851f9dc4 100644 --- a/engine/common/model.c +++ b/engine/common/model.c @@ -614,7 +614,7 @@ void GAME_EXPORT Mod_LoadCacheFile( const char *filename, cache_user_t *cu ) #if XASH_BIG_ENDIAN if( size >= sizeof( int ) && LittleLong( IDSEQGRPHEADER ) == *(uint *)cu->data ) { - studiohdr_t *phdr = (studiohdr_t *)(intptr_t)REF_GET_PARM( PARM_GET_STUDIO_HDR, 0 ); + studiohdr_t *phdr = (studiohdr_t *)REF_GET_PARM( PARM_GET_STUDIO_HDR, 0 ); if( !phdr ) return; diff --git a/engine/ref_api.h b/engine/ref_api.h index d504faa9..7b9f8253 100644 --- a/engine/ref_api.h +++ b/engine/ref_api.h @@ -72,7 +72,8 @@ GNU General Public License for more details. // Moved RenderAPI and TriAPI filling to renderer via R_FillRenderAPI and R_FillTriAPI // Moved detail textures parsing and cinematic texture management to engine // Moved creation of default textures to the engine -#define REF_API_VERSION 15 +// 16. RefGetParm return type changed from int to intptr_t. +#define REF_API_VERSION 16 #define TF_SKY (TF_SKYSIDE|TF_NOMIPMAP|TF_ALLOW_NEAREST) #define TF_FONT (TF_NOMIPMAP|TF_CLAMP|TF_ALLOW_NEAREST) @@ -599,7 +600,7 @@ typedef struct ref_interface_s void (*CL_DrawBeams)( int fTrans , BEAM *beams ); // Xash3D Render Interface - int (*RefGetParm)( int parm, int arg ); // generic + intptr_t (*RefGetParm)( int parm, int arg ); // generic // detail texture scale void (*R_GetDetailScaleForTexture)( int texture, float *xScale, float *yScale ); diff --git a/ref/gl/gl_context.c b/ref/gl/gl_context.c index f436b0e7..038abd41 100644 --- a/ref/gl/gl_context.c +++ b/ref/gl/gl_context.c @@ -161,7 +161,7 @@ static qboolean Mod_ProcessRenderData( model_t *mod, qboolean create, const byte return loaded; } -static int GL_RefGetParm( int parm, int arg ) +static intptr_t GL_RefGetParm( int parm, int arg ) { gl_texture_t *glt; diff --git a/ref/null/r_context.c b/ref/null/r_context.c index e2b537b6..e97214d6 100644 --- a/ref/null/r_context.c +++ b/ref/null/r_context.c @@ -224,7 +224,7 @@ static void CL_DrawBeams( int fTrans, BEAM *beams ) ; } -static int RefGetParm( int parm, int arg ) +static intptr_t RefGetParm( int parm, int arg ) { return 0; } diff --git a/ref/soft/r_context.c b/ref/soft/r_context.c index c9113d00..1f6c02ae 100644 --- a/ref/soft/r_context.c +++ b/ref/soft/r_context.c @@ -120,7 +120,7 @@ static qboolean GAME_EXPORT Mod_ProcessRenderData( model_t *mod, qboolean create return loaded; } -static int GL_RefGetParm( int parm, int arg ) +static intptr_t GL_RefGetParm( int parm, int arg ) { image_t *glt;