YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FWGS/xash3d-fwgs into switch_newer

Browse Source
This commit is contained in:
fgsfds 2023-02-08 00:56:20 +01:00
commit 0e7ebf6d44
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/common/mod_studio.c
View File

@ -116,7 +116,7 @@ void Mod_ClearStudioCache( void )
AddToStudioCache AddToStudioCache
==================== ====================
*/ */
void Mod_AddToStudioCache( float frame, int sequence, vec3_t angles, vec3_t origin, vec3_t size, byte *pcontroller, byte *pblending, model_t *model, hull_t *hull, int numhitboxes ) static void Mod_AddToStudioCache( float frame, int sequence, vec3_t angles, vec3_t origin, vec3_t size, byte *pcontroller, byte *pblending, model_t *model, hull_t *hull, int numhitboxes )
{ {
mstudiocache_t *pCache; mstudiocache_t *pCache;
@ -153,7 +153,7 @@ void Mod_AddToStudioCache( float frame, int sequence, vec3_t angles, vec3_t orig
CheckStudioCache CheckStudioCache
==================== ====================
*/ */
mstudiocache_t *Mod_CheckStudioCache( model_t *model, float frame, int sequence, vec3_t angles, vec3_t origin, vec3_t size, byte *controller, byte *blending ) static mstudiocache_t *Mod_CheckStudioCache( model_t *model, float frame, int sequence, vec3_t angles, vec3_t origin, vec3_t size, byte *controller, byte *blending )
{ {
mstudiocache_t *pCached; mstudiocache_t *pCached;
int i; int i;
@ -204,7 +204,7 @@ mstudiocache_t *Mod_CheckStudioCache( model_t *model, float frame, int sequence,
SetStudioHullPlane SetStudioHullPlane
==================== ====================
*/ */
void Mod_SetStudioHullPlane( int planenum, int bone, int axis, float offset, const vec3_t size ) static void Mod_SetStudioHullPlane( int planenum, int bone, int axis, float offset, const vec3_t size )
{ {
mplane_t *pl = &studio_planes[planenum]; mplane_t *pl = &studio_planes[planenum];
@ -823,7 +823,7 @@ int Mod_HitgroupForStudioHull( int index )
StudioBoundVertex StudioBoundVertex
==================== ====================
*/ */
void Mod_StudioBoundVertex( vec3_t mins, vec3_t maxs, int *numverts, const vec3_t vertex ) static void Mod_StudioBoundVertex( vec3_t mins, vec3_t maxs, int *numverts, const vec3_t vertex )
{ {
if((*numverts) == 0 ) if((*numverts) == 0 )
ClearBounds( mins, maxs ); ClearBounds( mins, maxs );
@ -837,7 +837,7 @@ void Mod_StudioBoundVertex( vec3_t mins, vec3_t maxs, int *numverts, const vec3_
StudioAccumulateBoneVerts StudioAccumulateBoneVerts
==================== ====================
*/ */
void Mod_StudioAccumulateBoneVerts( vec3_t mins, vec3_t maxs, int *numverts, vec3_t bone_mins, vec3_t bone_maxs, int *numbones ) static void Mod_StudioAccumulateBoneVerts( vec3_t mins, vec3_t maxs, int *numverts, vec3_t bone_mins, vec3_t bone_maxs, int *numbones )
{ {
vec3_t delta; vec3_t delta;
vec3_t point; vec3_t point;
@ -1009,7 +1009,7 @@ static int Mod_StudioBodyVariations( model_t *mod )
R_StudioLoadHeader R_StudioLoadHeader
================= =================
*/ */
studiohdr_t *R_StudioLoadHeader( model_t *mod, const void *buffer ) static studiohdr_t *R_StudioLoadHeader( model_t *mod, const void *buffer )
{ {
byte *pin; byte *pin;
studiohdr_t *phdr; studiohdr_t *phdr;

2
public/build.c
View File

@ -164,7 +164,7 @@ const char *Q_ArchitectureStringByID( const int arch, const uint abi, const int
const qboolean hardfp = FBitSet( abi, ARCHITECTURE_ARM_HARDFP ); const qboolean hardfp = FBitSet( abi, ARCHITECTURE_ARM_HARDFP );
if( is64 ) if( is64 )
return "aarch64"; return "arm64"; // keep as arm64, it's not aarch64!
switch( ver ) switch( ver )
{ {