From 5ba2449d1058c3635c083775dd658baf184878d3 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 7 Feb 2023 04:50:52 +0300 Subject: [PATCH 1/2] engine: common: static-ify functions in mod_studio.c --- engine/common/mod_studio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/common/mod_studio.c b/engine/common/mod_studio.c index 45a39c54..56f241ae 100644 --- a/engine/common/mod_studio.c +++ b/engine/common/mod_studio.c @@ -116,7 +116,7 @@ void Mod_ClearStudioCache( void ) 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; @@ -153,7 +153,7 @@ void Mod_AddToStudioCache( float frame, int sequence, vec3_t angles, vec3_t orig 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; int i; @@ -204,7 +204,7 @@ mstudiocache_t *Mod_CheckStudioCache( model_t *model, float frame, int sequence, 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]; @@ -823,7 +823,7 @@ int Mod_HitgroupForStudioHull( int index ) 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 ) ClearBounds( mins, maxs ); @@ -837,7 +837,7 @@ void Mod_StudioBoundVertex( vec3_t mins, vec3_t maxs, int *numverts, const vec3_ 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 point; @@ -1009,7 +1009,7 @@ static int Mod_StudioBodyVariations( model_t *mod ) 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; studiohdr_t *phdr; From 03a7c6773178dc06937833d9efdec0aa3093b742 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 8 Feb 2023 00:03:01 +0300 Subject: [PATCH 2/2] public: build: revert arm64 renaming to aarch64, we shouldn't enforce naming changes without a reason --- public/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/build.c b/public/build.c index 758ef738..a00202c1 100644 --- a/public/build.c +++ b/public/build.c @@ -162,7 +162,7 @@ const char *Q_ArchitectureStringByID( const int arch, const uint abi, const int const qboolean hardfp = FBitSet( abi, ARCHITECTURE_ARM_HARDFP ); if( is64 ) - return "aarch64"; + return "arm64"; // keep as arm64, it's not aarch64! switch( ver ) {