From 75d476f9dfb0d7e3ec22bf7267f7569d6384d0da Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 27 Jan 2024 19:48:17 +0300 Subject: [PATCH] engine: fix -Wmissing-prototypes --- engine/client/cl_custom.c | 2 +- engine/client/cl_demo.c | 30 ++++++------ engine/client/cl_efx.c | 10 ++-- engine/client/cl_events.c | 10 ++-- engine/client/cl_frame.c | 28 +++++------ engine/client/cl_game.c | 8 +-- engine/client/cl_gameui.c | 2 +- engine/client/cl_main.c | 78 +++++++++++++++--------------- engine/client/cl_parse.c | 28 +++++------ engine/client/cl_parse_48.c | 12 ++--- engine/client/cl_pmove.c | 6 +-- engine/client/cl_qparse.c | 10 ++-- engine/client/cl_render.c | 2 +- engine/client/cl_scrn.c | 8 +-- engine/client/cl_tent.c | 12 ++--- engine/client/cl_video.c | 2 +- engine/client/cl_view.c | 18 +++---- engine/client/console.c | 36 +++++++------- engine/client/in_touch.c | 2 +- engine/client/input.c | 8 +-- engine/client/keys.c | 12 ++--- engine/client/s_main.c | 40 +++++++-------- engine/client/s_mix.c | 42 ++++++++-------- engine/common/cfgscript.c | 8 +-- engine/common/cmd.c | 18 +++---- engine/common/con_utils.c | 26 +++++----- engine/common/cvar.c | 14 +++--- engine/common/host.c | 28 +++++------ engine/common/host_state.c | 4 +- engine/common/hpak.c | 12 ++--- engine/common/imagelib/img_dds.c | 12 ++--- engine/common/imagelib/img_main.c | 1 + engine/common/imagelib/img_quant.c | 16 +++--- engine/common/imagelib/img_utils.c | 22 ++++----- engine/common/infostring.c | 4 +- engine/common/mod_bmodel.c | 2 +- engine/common/mod_sprite.c | 1 + engine/common/net_buffer.c | 2 +- engine/common/net_chan.c | 20 ++++---- engine/common/net_ws.c | 12 ++--- engine/common/pm_surface.c | 4 +- engine/common/pm_trace.c | 4 +- engine/common/soundlib/snd_main.c | 5 +- engine/common/soundlib/snd_mp3.c | 3 +- engine/common/soundlib/snd_utils.c | 4 +- engine/common/soundlib/snd_wav.c | 2 +- engine/common/system.c | 2 +- engine/platform/sdl/s_sdl.c | 4 +- engine/server/sv_client.c | 40 +++++++-------- engine/server/sv_cmds.c | 58 +++++++++++----------- engine/server/sv_custom.c | 18 +++---- engine/server/sv_filter.c | 4 +- engine/server/sv_frame.c | 14 +++--- engine/server/sv_init.c | 14 +++--- engine/server/sv_main.c | 10 ++-- engine/server/sv_move.c | 6 +-- engine/server/sv_phys.c | 2 +- 57 files changed, 404 insertions(+), 398 deletions(-) diff --git a/engine/client/cl_custom.c b/engine/client/cl_custom.c index b028066e..58823a18 100644 --- a/engine/client/cl_custom.c +++ b/engine/client/cl_custom.c @@ -127,7 +127,7 @@ void CL_MoveToOnHandList( resource_t *pResource ) CL_AddToResourceList( pResource, &cl.resourcesonhand ); } -void CL_ClearResourceList( resource_t *pList ) +static void CL_ClearResourceList( resource_t *pList ) { resource_t *p, *n; diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c index a21ff72d..59d78aa9 100644 --- a/engine/client/cl_demo.c +++ b/engine/client/cl_demo.c @@ -156,7 +156,7 @@ CL_GetDemoRecordClock write time while demo is recording ==================== */ -float CL_GetDemoRecordClock( void ) +static float CL_GetDemoRecordClock( void ) { return cl.mtime[0]; } @@ -168,7 +168,7 @@ CL_GetDemoPlaybackClock overwrite host.realtime ==================== */ -float CL_GetDemoPlaybackClock( void ) +static float CL_GetDemoPlaybackClock( void ) { return host.realtime + host.frametime; } @@ -194,7 +194,7 @@ CL_WriteDemoCmdHeader Writes the demo command header and time-delta ==================== */ -void CL_WriteDemoCmdHeader( byte cmd, file_t *file ) +static void CL_WriteDemoCmdHeader( byte cmd, file_t *file ) { float dt; @@ -267,7 +267,7 @@ Save state of cls.netchan sequences so that we can play the demo correctly. ==================== */ -void CL_WriteDemoSequence( file_t *file ) +static void CL_WriteDemoSequence( file_t *file ) { Assert( file != NULL ); @@ -348,7 +348,7 @@ CL_WriteDemoHeader Write demo header ==================== */ -void CL_WriteDemoHeader( const char *name ) +static void CL_WriteDemoHeader( const char *name ) { int copysize; int savepos; @@ -518,7 +518,7 @@ CL_ReadDemoCmdHeader read the demo command ================= */ -qboolean CL_ReadDemoCmdHeader( byte *cmd, float *dt ) +static qboolean CL_ReadDemoCmdHeader( byte *cmd, float *dt ) { // read the command // HACKHACK: skip NOPs @@ -548,7 +548,7 @@ read the demo usercmd for predicting and smooth movement during playback the demo ================= */ -void CL_ReadDemoUserCmd( qboolean discard ) +static void CL_ReadDemoUserCmd( qboolean discard ) { byte data[1024]; int cmdnumber; @@ -613,7 +613,7 @@ CL_ReadDemoSequence read netchan sequences ================= */ -void CL_ReadDemoSequence( qboolean discard ) +static void CL_ReadDemoSequence( qboolean discard ) { int incoming_sequence; int incoming_acknowledged; @@ -647,7 +647,7 @@ void CL_ReadDemoSequence( qboolean discard ) CL_DemoStartPlayback ================= */ -void CL_DemoStartPlayback( int mode ) +static void CL_DemoStartPlayback( int mode ) { if( cls.changedemo ) { @@ -692,7 +692,7 @@ void CL_DemoStartPlayback( int mode ) CL_DemoAborted ================= */ -void CL_DemoAborted( void ) +static void CL_DemoAborted( void ) { if( cls.demofile ) FS_Close( cls.demofile ); @@ -732,7 +732,7 @@ returns true on success, false on failure g-cont. probably captain obvious mode is ON ================= */ -qboolean CL_DemoMoveToNextSection( void ) +static qboolean CL_DemoMoveToNextSection( void ) { if( ++demo.entryIndex >= demo.directory.numentries ) { @@ -754,7 +754,7 @@ qboolean CL_DemoMoveToNextSection( void ) return true; } -qboolean CL_ReadRawNetworkData( byte *buffer, size_t *length ) +static qboolean CL_ReadRawNetworkData( byte *buffer, size_t *length ) { int msglen = 0; @@ -805,7 +805,7 @@ CL_DemoReadMessageQuake reads demo data and write it to client ================= */ -qboolean CL_DemoReadMessageQuake( byte *buffer, size_t *length ) +static qboolean CL_DemoReadMessageQuake( byte *buffer, size_t *length ) { vec3_t viewangles; int msglen = 0; @@ -1020,7 +1020,7 @@ qboolean CL_DemoReadMessage( byte *buffer, size_t *length ) return CL_ReadRawNetworkData( buffer, length ); } -void CL_DemoFindInterpolatedViewAngles( float t, float *frac, demoangle_t **prev, demoangle_t **next ) +static void CL_DemoFindInterpolatedViewAngles( float t, float *frac, demoangle_t **prev, demoangle_t **next ) { int i, i0, i1, imod; float at; @@ -1115,7 +1115,7 @@ CL_FinishTimeDemo show stats ============== */ -void CL_FinishTimeDemo( void ) +static void CL_FinishTimeDemo( void ) { int frames; double time; diff --git a/engine/client/cl_efx.c b/engine/client/cl_efx.c index f188fa4f..cf40d1b6 100644 --- a/engine/client/cl_efx.c +++ b/engine/client/cl_efx.c @@ -218,7 +218,7 @@ R_AllocTracer can return NULL if particles is out ================ */ -particle_t *R_AllocTracer( const vec3_t org, const vec3_t vel, float life ) +static particle_t *R_AllocTracer( const vec3_t org, const vec3_t vel, float life ) { particle_t *p; @@ -300,7 +300,7 @@ R_BeamAlloc ============== */ -BEAM *R_BeamAlloc( void ) +static BEAM *R_BeamAlloc( void ) { BEAM *pBeam; @@ -323,7 +323,7 @@ R_BeamFree ============== */ -void R_BeamFree( BEAM *pBeam ) +static void R_BeamFree( BEAM *pBeam ) { // free particles that have died off. R_FreeDeadParticles( &pBeam->particles ); @@ -605,7 +605,7 @@ CL_BeamAttemptToDie Check for expired beams ============== */ -qboolean CL_BeamAttemptToDie( BEAM *pBeam ) +static qboolean CL_BeamAttemptToDie( BEAM *pBeam ) { Assert( pBeam != NULL ); @@ -2040,7 +2040,7 @@ void CL_ReadPointFile_f( void ) else Con_Printf( "map %s has no leaks!\n", clgame.mapname ); } -void CL_FreeDeadBeams( void ) +static void CL_FreeDeadBeams( void ) { BEAM *pBeam, *pNext, *pPrev = NULL; // draw temporary entity beams diff --git a/engine/client/cl_events.c b/engine/client/cl_events.c index cbc7cb30..2b89c3f1 100644 --- a/engine/client/cl_events.c +++ b/engine/client/cl_events.c @@ -40,7 +40,7 @@ CL_CalcPlayerVelocity compute velocity for a given client ============= */ -void CL_CalcPlayerVelocity( int idx, vec3_t velocity ) +static void CL_CalcPlayerVelocity( int idx, vec3_t velocity ) { clientdata_t *pcd; vec3_t delta; @@ -78,7 +78,7 @@ CL_DescribeEvent ============= */ -void CL_DescribeEvent( event_info_t *ei, int slot ) +static void CL_DescribeEvent( event_info_t *ei, int slot ) { int idx = (slot & 63) * 2; con_nprint_t info; @@ -202,7 +202,7 @@ CL_FireEvent ============= */ -qboolean CL_FireEvent( event_info_t *ei, int slot ) +static qboolean CL_FireEvent( event_info_t *ei, int slot ) { cl_user_event_t *ev; const char *name; @@ -292,7 +292,7 @@ CL_FindEvent find first empty event ============= */ -event_info_t *CL_FindEmptyEvent( void ) +static event_info_t *CL_FindEmptyEvent( void ) { int i; event_state_t *es; @@ -320,7 +320,7 @@ CL_FindEvent replace only unreliable events ============= */ -event_info_t *CL_FindUnreliableEvent( void ) +static event_info_t *CL_FindUnreliableEvent( void ) { event_state_t *es; event_info_t *ei; diff --git a/engine/client/cl_frame.c b/engine/client/cl_frame.c index eb024315..50220c7a 100644 --- a/engine/client/cl_frame.c +++ b/engine/client/cl_frame.c @@ -52,7 +52,7 @@ CL_UpdatePositions Store another position into interpolation circular buffer ================== */ -void CL_UpdatePositions( cl_entity_t *ent ) +static void CL_UpdatePositions( cl_entity_t *ent ) { position_history_t *ph, *prev; @@ -85,7 +85,7 @@ CL_ResetPositions Interpolation init or reset after teleporting ================== */ -void CL_ResetPositions( cl_entity_t *ent ) +static void CL_ResetPositions( cl_entity_t *ent ) { position_history_t store; @@ -107,7 +107,7 @@ check for instant movement in case we don't want interpolate this ================== */ -qboolean CL_EntityTeleported( cl_entity_t *ent ) +static qboolean CL_EntityTeleported( cl_entity_t *ent ) { float len, maxlen; vec3_t delta; @@ -128,7 +128,7 @@ CL_CompareTimestamps round-off floating errors ================== */ -qboolean CL_CompareTimestamps( float t1, float t2 ) +static qboolean CL_CompareTimestamps( float t1, float t2 ) { int iTime1 = t1 * 1000; int iTime2 = t2 * 1000; @@ -143,7 +143,7 @@ CL_EntityIgnoreLerp some ents will be ignore lerping ================== */ -qboolean CL_EntityIgnoreLerp( cl_entity_t *e ) +static qboolean CL_EntityIgnoreLerp( cl_entity_t *e ) { if( cl_nointerp.value > 0.f ) return true; @@ -160,7 +160,7 @@ CL_EntityCustomLerp ================== */ -qboolean CL_EntityCustomLerp( cl_entity_t *e ) +static qboolean CL_EntityCustomLerp( cl_entity_t *e ) { switch( e->curstate.movetype ) { @@ -226,7 +226,7 @@ CL_UpdateLatchedVars ==================== */ -void CL_UpdateLatchedVars( cl_entity_t *ent ) +static void CL_UpdateLatchedVars( cl_entity_t *ent ) { if( !ent->model || ( ent->model->type != mod_alias && ent->model->type != mod_studio )) return; // below fields used only for alias and studio interpolation @@ -321,7 +321,7 @@ CL_ProcessEntityUpdate apply changes since new frame received ================== */ -void CL_ProcessEntityUpdate( cl_entity_t *ent ) +static void CL_ProcessEntityUpdate( cl_entity_t *ent ) { qboolean parametric; @@ -605,7 +605,7 @@ reset latched state if this frame entity was teleported or just EF_NOINTERP was set ================= */ -void CL_ResetLatchedState( int pnum, frame_t *frame, cl_entity_t *ent ) +static void CL_ResetLatchedState( int pnum, frame_t *frame, cl_entity_t *ent ) { if( CHECKVISBIT( frame->flags, pnum )) { @@ -695,7 +695,7 @@ CL_FlushEntityPacket Read and ignore whole entity packet. ================= */ -void CL_FlushEntityPacket( sizebuf_t *msg ) +static void CL_FlushEntityPacket( sizebuf_t *msg ) { int newnum; entity_state_t from, to; @@ -725,7 +725,7 @@ CL_DeltaEntity processing delta update ================= */ -void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t *old, qboolean has_update ) +static void CL_DeltaEntity( sizebuf_t *msg, frame_t *frame, int newnum, entity_state_t *old, qboolean has_update ) { cl_entity_t *ent; entity_state_t *state; @@ -1057,7 +1057,7 @@ CL_LinkCustomEntity Add server beam to draw list ============= */ -void CL_LinkCustomEntity( cl_entity_t *ent, entity_state_t *state ) +static void CL_LinkCustomEntity( cl_entity_t *ent, entity_state_t *state ) { ent->curstate.movetype = state->modelindex; // !!! @@ -1080,7 +1080,7 @@ Create visible entities in the correct position for all current players ============= */ -void CL_LinkPlayers( frame_t *frame ) +static void CL_LinkPlayers( frame_t *frame ) { entity_state_t *state; cl_entity_t *ent; @@ -1163,7 +1163,7 @@ CL_LinkPacketEntities =============== */ -void CL_LinkPacketEntities( frame_t *frame ) +static void CL_LinkPacketEntities( frame_t *frame ) { cl_entity_t *ent; entity_state_t *state; diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c index 53368b67..31f26148 100644 --- a/engine/client/cl_game.c +++ b/engine/client/cl_game.c @@ -551,7 +551,7 @@ fill screen with specfied color can be modulated ============= */ -void CL_DrawScreenFade( void ) +static void CL_DrawScreenFade( void ) { screenfade_t *sf = &clgame.fade; int alpha; @@ -767,7 +767,7 @@ CL_SoundFromIndex return soundname from index ==================== */ -const char *CL_SoundFromIndex( int index ) +static const char *CL_SoundFromIndex( int index ) { sfx_t *sfx = NULL; int hSound; @@ -913,7 +913,7 @@ CL_DrawCrosshair Render crosshair ==================== */ -void CL_DrawCrosshair( void ) +static void CL_DrawCrosshair( void ) { int x, y, width, height; float xscale, yscale; @@ -1330,6 +1330,7 @@ pfnSPR_Load function exported for support GoldSrc Monitor utility ========= */ +HSPRITE EXPORT pfnSPR_Load( const char *szPicName ); HSPRITE EXPORT pfnSPR_Load( const char *szPicName ) { model_t *spr; @@ -1379,6 +1380,7 @@ pfnSPR_Frames function exported for support GoldSrc Monitor utility ========= */ +int EXPORT pfnSPR_Frames( HSPRITE hPic ); int EXPORT pfnSPR_Frames( HSPRITE hPic ) { int numFrames = 0; diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c index c1af3398..240695af 100644 --- a/engine/client/cl_gameui.c +++ b/engine/client/cl_gameui.c @@ -984,7 +984,7 @@ pfnCheckGameDll ========= */ -int GAME_EXPORT pfnCheckGameDll( void ) +static int GAME_EXPORT pfnCheckGameDll( void ) { #ifdef XASH_INTERNAL_GAMELIBS return true; diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index e21b52d7..1ec2984f 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -178,7 +178,7 @@ finalize connection process and begin new frame with new cls.state =============== */ -void CL_CheckClientState( void ) +static void CL_CheckClientState( void ) { // first update is the pre-final signon stage if(( cls.state == ca_connected || cls.state == ca_validate ) && ( cls.signon == SIGNONS )) @@ -278,7 +278,7 @@ CL_DriftInterpolationAmount Drift interpolation value (this is used for server unlag system) =============== */ -int CL_DriftInterpolationAmount( int goal ) +static int CL_DriftInterpolationAmount( int goal ) { float fgoal, maxmove, diff; int msec; @@ -306,7 +306,7 @@ CL_ComputeClientInterpolationAmount Validate interpolation cvars, calc interpolation window =============== */ -void CL_ComputeClientInterpolationAmount( usercmd_t *cmd ) +static void CL_ComputeClientInterpolationAmount( usercmd_t *cmd ) { const float epsilon = 0.001f; // to avoid float invalid comparision float min_interp; @@ -352,7 +352,7 @@ CL_ComputePacketLoss ================= */ -void CL_ComputePacketLoss( void ) +static void CL_ComputePacketLoss( void ) { int i, frm; frame_t *frame; @@ -397,7 +397,7 @@ void CL_UpdateFrameLerp( void ) cl.commands[(cls.netchan.outgoing_sequence - 1) & CL_UPDATE_MASK].frame_lerp = cl.lerpFrac; } -void CL_FindInterpolatedAddAngle( float t, float *frac, pred_viewangle_t **prev, pred_viewangle_t **next ) +static void CL_FindInterpolatedAddAngle( float t, float *frac, pred_viewangle_t **prev, pred_viewangle_t **next ) { int i, i0, i1, imod; float at; @@ -439,7 +439,7 @@ void CL_FindInterpolatedAddAngle( float t, float *frac, pred_viewangle_t **prev, *frac = bound( 0.0f, *frac, 1.0f ); } -void CL_ApplyAddAngle( void ) +static void CL_ApplyAddAngle( void ) { pred_viewangle_t *prev = NULL, *next = NULL; float addangletotal = 0.0f; @@ -475,7 +475,7 @@ CL_ProcessShowTexturesCmds navigate around texture atlas =============== */ -qboolean CL_ProcessShowTexturesCmds( usercmd_t *cmd ) +static qboolean CL_ProcessShowTexturesCmds( usercmd_t *cmd ) { static int oldbuttons; int changed; @@ -504,7 +504,7 @@ CL_ProcessOverviewCmds Transform user movement into overview adjust =============== */ -qboolean CL_ProcessOverviewCmds( usercmd_t *cmd ) +static qboolean CL_ProcessOverviewCmds( usercmd_t *cmd ) { ref_overview_t *ov = &clgame.overView; int sign = 1; @@ -556,7 +556,7 @@ CL_UpdateClientData tell the client.dll about player origin, angles, fov, etc ================= */ -void CL_UpdateClientData( void ) +static void CL_UpdateClientData( void ) { client_data_t cdat; @@ -583,7 +583,7 @@ void CL_UpdateClientData( void ) CL_CreateCmd ================= */ -void CL_CreateCmd( void ) +static void CL_CreateCmd( void ) { usercmd_t nullcmd, *cmd; runcmd_t *pcmd; @@ -687,7 +687,7 @@ Create and send the command packet to the server Including both the reliable commands and the usercmds =================== */ -void CL_WritePacket( void ) +static void CL_WritePacket( void ) { sizebuf_t buf; qboolean send_command = false; @@ -893,7 +893,7 @@ void CL_SendCommand( void ) CL_BeginUpload_f ================== */ -void CL_BeginUpload_f( void ) +static void CL_BeginUpload_f( void ) { const char *name; resource_t custResource; @@ -990,7 +990,7 @@ We have gotten a challenge from the server, so try and connect. ====================== */ -void CL_SendConnectPacket( void ) +static void CL_SendConnectPacket( void ) { char protinfo[MAX_INFO_STRING]; const char *qport; @@ -1076,7 +1076,7 @@ CL_CheckForResend Resend a connect message if the last one has timed out ================= */ -void CL_CheckForResend( void ) +static void CL_CheckForResend( void ) { netadr_t adr; net_gai_state_t res; @@ -1162,7 +1162,7 @@ void CL_CheckForResend( void ) Netchan_OutOfBandPrint( NS_CLIENT, adr, "getchallenge\n" ); } -resource_t *CL_AddResource( resourcetype_t type, const char *name, int size, qboolean bFatalIfMissing, int index ) +static resource_t *CL_AddResource( resourcetype_t type, const char *name, int size, qboolean bFatalIfMissing, int index ) { resource_t *r = &cl.resourcelist[cl.num_resources]; @@ -1179,7 +1179,7 @@ resource_t *CL_AddResource( resourcetype_t type, const char *name, int size, qbo return r; } -void CL_CreateResourceList( void ) +static void CL_CreateResourceList( void ) { char szFileName[MAX_OSPATH]; byte rgucMD5_hash[16]; @@ -1227,7 +1227,7 @@ CL_Connect_f ================ */ -void CL_Connect_f( void ) +static void CL_Connect_f( void ) { string server; qboolean legacyconnect = false; @@ -1274,7 +1274,7 @@ Send the rest of the command line over as an unconnected command. ===================== */ -void CL_Rcon_f( void ) +static void CL_Rcon_f( void ) { char message[1024]; netadr_t to; @@ -1381,7 +1381,7 @@ CL_SendDisconnectMessage Sends a disconnect message to the server ===================== */ -void CL_SendDisconnectMessage( void ) +static void CL_SendDisconnectMessage( void ) { sizebuf_t buf; byte data[32]; @@ -1426,7 +1426,7 @@ CL_Reconnect build a request to reconnect client ===================== */ -void CL_Reconnect( qboolean setup_netchan ) +static void CL_Reconnect( qboolean setup_netchan ) { if( setup_netchan ) { @@ -1553,7 +1553,7 @@ void CL_Crashed( void ) CL_LocalServers_f ================= */ -void CL_LocalServers_f( void ) +static void CL_LocalServers_f( void ) { netadr_t adr; @@ -1622,7 +1622,7 @@ static void CL_SendMasterServerScanRequest( void ) CL_InternetServers_f ================= */ -void CL_InternetServers_f( void ) +static void CL_InternetServers_f( void ) { qboolean nat = cl_nat.value != 0.0f; uint32_t key; @@ -1651,7 +1651,7 @@ CL_Reconnect_f The server is changing levels ================= */ -void CL_Reconnect_f( void ) +static void CL_Reconnect_f( void ) { if( cls.state == ca_disconnected ) return; @@ -1688,7 +1688,7 @@ CL_FixupColorStringsForInfoString all the keys and values must be ends with ^7 ================= */ -void CL_FixupColorStringsForInfoString( const char *in, char *out ) +static void CL_FixupColorStringsForInfoString( const char *in, char *out ) { qboolean hasPrefix = false; qboolean endOfKeyVal = false; @@ -1752,7 +1752,7 @@ CL_ParseStatusMessage Handle a reply from a info ================= */ -void CL_ParseStatusMessage( netadr_t from, sizebuf_t *msg ) +static void CL_ParseStatusMessage( netadr_t from, sizebuf_t *msg ) { static char infostring[MAX_INFO_STRING+8]; char *s = MSG_ReadString( msg ); @@ -1801,7 +1801,7 @@ CL_ParseNETInfoMessage Handle a reply from a netinfo ================= */ -void CL_ParseNETInfoMessage( netadr_t from, sizebuf_t *msg, const char *s ) +static void CL_ParseNETInfoMessage( netadr_t from, sizebuf_t *msg, const char *s ) { net_request_t *nr; static char infostring[MAX_INFO_STRING+8]; @@ -1856,7 +1856,7 @@ CL_ProcessNetRequests check for timeouts ================= */ -void CL_ProcessNetRequests( void ) +static void CL_ProcessNetRequests( void ) { net_request_t *nr; int i; @@ -1938,7 +1938,7 @@ CL_ConnectionlessPacket Responses to broadcasts, etc ================= */ -void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg ) +static void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg ) { char *args; const char *c; @@ -2235,7 +2235,7 @@ CL_GetMessage Handles recording and playback of demos, on top of NET_ code ==================== */ -int CL_GetMessage( byte *data, size_t *length ) +static int CL_GetMessage( byte *data, size_t *length ) { if( cls.demoplayback ) { @@ -2254,7 +2254,7 @@ int CL_GetMessage( byte *data, size_t *length ) CL_ReadNetMessage ================= */ -void CL_ReadNetMessage( void ) +static void CL_ReadNetMessage( void ) { size_t curSize; @@ -2338,7 +2338,7 @@ Updates the local time and reads/handles messages on client net connection. ================= */ -void CL_ReadPackets( void ) +static void CL_ReadPackets( void ) { // decide the simulation time cl.oldtime = cl.time; @@ -2402,7 +2402,7 @@ CL_CleanFileName Replace the displayed name for some resources ==================== */ -const char *CL_CleanFileName( const char *filename ) +static const char *CL_CleanFileName( const char *filename ) { if( COM_CheckString( filename ) && filename[0] == '!' ) return "customization"; @@ -2418,7 +2418,7 @@ CL_RegisterCustomization register custom resource for player ==================== */ -void CL_RegisterCustomization( resource_t *resource ) +static void CL_RegisterCustomization( resource_t *resource ) { qboolean bFound = false; customization_t *pList; @@ -2624,7 +2624,7 @@ void CL_ServerCommand( qboolean reliable, const char *fmt, ... ) CL_SetInfo_f ============== */ -void CL_SetInfo_f( void ) +static void CL_SetInfo_f( void ) { convar_t *var; @@ -2664,7 +2664,7 @@ void CL_SetInfo_f( void ) CL_Physinfo_f ============== */ -void CL_Physinfo_f( void ) +static void CL_Physinfo_f( void ) { Con_Printf( "Phys info settings:\n" ); Info_Print( cls.physinfo ); @@ -2819,7 +2819,7 @@ CL_FullServerinfo_f Sent by server when serverinfo changes ================== */ -void CL_FullServerinfo_f( void ) +static void CL_FullServerinfo_f( void ) { if( Cmd_Argc() != 2 ) { @@ -2837,7 +2837,7 @@ CL_Escape_f Escape to menu from game ================= */ -void CL_Escape_f( void ) +static void CL_Escape_f( void ) { if( cls.key_dest == key_menu ) return; @@ -2855,7 +2855,7 @@ void CL_Escape_f( void ) CL_InitLocal ================= */ -void CL_InitLocal( void ) +static void CL_InitLocal( void ) { cls.state = ca_disconnected; cls.signon = 0; @@ -3005,7 +3005,7 @@ slowly adjuct client clock to smooth lag effect ================== */ -void CL_AdjustClock( void ) +static void CL_AdjustClock( void ) { if( cl.timedelta == 0.0f || !cl_fixtimerate.value ) return; diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c index d61020e1..d3c9b5a1 100644 --- a/engine/client/cl_parse.c +++ b/engine/client/cl_parse.c @@ -32,7 +32,7 @@ CL_UserMsgStub Default stub for missed callbacks =============== */ -int CL_UserMsgStub( const char *pszName, int iSize, void *pbuf ) +static int CL_UserMsgStub( const char *pszName, int iSize, void *pbuf ) { return 1; } @@ -58,7 +58,7 @@ CL_ParseSoundPacket ================== */ -void CL_ParseSoundPacket( sizebuf_t *msg ) +static void CL_ParseSoundPacket( sizebuf_t *msg ) { vec3_t pos; int chan, sound; @@ -305,7 +305,7 @@ CL_ParseStaticEntity static client entity ================== */ -void CL_ParseStaticEntity( sizebuf_t *msg ) +static void CL_ParseStaticEntity( sizebuf_t *msg ) { int i, newnum; entity_state_t from, to; @@ -619,7 +619,7 @@ static void CL_StartResourceDownloading( const char *pszMessage, qboolean bCusto CL_BatchResourceRequest( !bCustom ); } -customization_t *CL_PlayerHasCustomization( int nPlayerNum, resourcetype_t type ) +static customization_t *CL_PlayerHasCustomization( int nPlayerNum, resourcetype_t type ) { customization_t *pList; @@ -631,7 +631,7 @@ customization_t *CL_PlayerHasCustomization( int nPlayerNum, resourcetype_t type return NULL; } -void CL_RemoveCustomization( int nPlayerNum, customization_t *pRemove ) +static void CL_RemoveCustomization( int nPlayerNum, customization_t *pRemove ) { customization_t *pList; customization_t *pNext; @@ -802,7 +802,7 @@ CL_CreateCustomizationList loading custom decal for self ================== */ -void CL_CreateCustomizationList( void ) +static void CL_CreateCustomizationList( void ) { resource_t *pResource; player_info_t *pPlayer; @@ -1494,7 +1494,7 @@ void CL_UpdateUserPings( sizebuf_t *msg ) } } -void CL_SendConsistencyInfo( sizebuf_t *msg ) +static void CL_SendConsistencyInfo( sizebuf_t *msg ) { qboolean user_changed_diskfile; vec3_t mins, maxs; @@ -1671,7 +1671,7 @@ void CL_RegisterResources( sizebuf_t *msg ) } } -void CL_ParseConsistencyInfo( sizebuf_t *msg ) +static void CL_ParseConsistencyInfo( sizebuf_t *msg ) { int lastcheck; int delta; @@ -1736,7 +1736,7 @@ CL_ParseResourceList ============== */ -void CL_ParseResourceList( sizebuf_t *msg ) +static void CL_ParseResourceList( sizebuf_t *msg ) { resource_t *pResource; int i, total; @@ -1773,7 +1773,7 @@ CL_ParseVoiceInit ================== */ -void CL_ParseVoiceInit( sizebuf_t *msg ) +static void CL_ParseVoiceInit( sizebuf_t *msg ) { char *pszCodec = MSG_ReadString( msg ); int quality = MSG_ReadByte( msg ); @@ -1787,7 +1787,7 @@ CL_ParseVoiceData ================== */ -void CL_ParseVoiceData( sizebuf_t *msg ) +static void CL_ParseVoiceData( sizebuf_t *msg ) { int size, idx, frames; byte received[8192]; @@ -1904,7 +1904,7 @@ CL_ParseScreenShake Set screen shake ============== */ -void CL_ParseScreenShake( sizebuf_t *msg ) +static void CL_ParseScreenShake( sizebuf_t *msg ) { float amplitude = (float)(word)MSG_ReadShort( msg ) * ( 1.0f / (float)( 1 << 12 )); float duration = (float)(word)MSG_ReadShort( msg ) * ( 1.0f / (float)( 1 << 12 )); @@ -1927,7 +1927,7 @@ CL_ParseScreenFade Set screen fade ============== */ -void CL_ParseScreenFade( sizebuf_t *msg ) +static void CL_ParseScreenFade( sizebuf_t *msg ) { float duration, holdTime; screenfade_t *sf = &clgame.fade; @@ -2026,7 +2026,7 @@ CL_ParseExec Exec map/class specific configs ============== */ -void CL_ParseExec( sizebuf_t *msg ) +static void CL_ParseExec( sizebuf_t *msg ) { qboolean is_class; int class_idx; diff --git a/engine/client/cl_parse_48.c b/engine/client/cl_parse_48.c index fe79017c..4a3a0455 100644 --- a/engine/client/cl_parse_48.c +++ b/engine/client/cl_parse_48.c @@ -30,7 +30,7 @@ CL_ParseStaticEntity static client entity ================== */ -void CL_LegacyParseStaticEntity( sizebuf_t *msg ) +static void CL_LegacyParseStaticEntity( sizebuf_t *msg ) { int i; entity_state_t state; @@ -98,7 +98,7 @@ void CL_LegacyParseStaticEntity( sizebuf_t *msg ) R_AddEfrags( ent ); // add link } -void CL_LegacyParseSoundPacket( sizebuf_t *msg, qboolean is_ambient ) +static void CL_LegacyParseSoundPacket( sizebuf_t *msg, qboolean is_ambient ) { vec3_t pos; int chan, sound; @@ -167,7 +167,7 @@ CL_PrecacheSound prceache sound from server ================ */ -void CL_LegacyPrecacheSound( sizebuf_t *msg ) +static void CL_LegacyPrecacheSound( sizebuf_t *msg ) { int soundIndex; @@ -184,7 +184,7 @@ void CL_LegacyPrecacheSound( sizebuf_t *msg ) cl.sound_index[soundIndex] = S_RegisterSound( cl.sound_precache[soundIndex] ); } -void CL_LegacyPrecacheModel( sizebuf_t *msg ) +static void CL_LegacyPrecacheModel( sizebuf_t *msg ) { int modelIndex; string model; @@ -214,7 +214,7 @@ void CL_LegacyPrecacheModel( sizebuf_t *msg ) cl.nummodels = Q_max( cl.nummodels, modelIndex ); } -void CL_LegacyPrecacheEvent( sizebuf_t *msg ) +static void CL_LegacyPrecacheEvent( sizebuf_t *msg ) { int eventIndex; @@ -242,7 +242,7 @@ CL_ParseResourceList ============== */ -void CL_LegacyParseResourceList( sizebuf_t *msg ) +static void CL_LegacyParseResourceList( sizebuf_t *msg ) { int i = 0; static struct diff --git a/engine/client/cl_pmove.c b/engine/client/cl_pmove.c index c5be4d32..8dad600c 100644 --- a/engine/client/cl_pmove.c +++ b/engine/client/cl_pmove.c @@ -417,7 +417,7 @@ CL_AddLinksToPmove collect solid entities ==================== */ -void CL_AddLinksToPmove( frame_t *frame ) +static void CL_AddLinksToPmove( frame_t *frame ) { entity_state_t *state; model_t *model; @@ -897,7 +897,7 @@ static void CL_SetupPMove( playermove_t *pmove, const local_state_t *from, const Q_strncpy( pmove->physinfo, cls.physinfo, MAX_INFO_STRING ); } -const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to ) +static const void CL_FinishPMove( const playermove_t *pmove, local_state_t *to ) { entity_state_t *ps; clientdata_t *cd; @@ -950,7 +950,7 @@ CL_RunUsercmd Runs prediction code for user cmd ================= */ -void CL_RunUsercmd( local_state_t *from, local_state_t *to, usercmd_t *u, qboolean runfuncs, double *time, unsigned int random_seed ) +static void CL_RunUsercmd( local_state_t *from, local_state_t *to, usercmd_t *u, qboolean runfuncs, double *time, unsigned int random_seed ) { usercmd_t cmd; diff --git a/engine/client/cl_qparse.c b/engine/client/cl_qparse.c index 442b86aa..49575198 100644 --- a/engine/client/cl_qparse.c +++ b/engine/client/cl_qparse.c @@ -414,7 +414,7 @@ If an entities model or origin changes from frame to frame, it must be relinked. Other attributes can change without relinking. ================== */ -void CL_ParseQuakeEntityData( sizebuf_t *msg, int bits ) +static void CL_ParseQuakeEntityData( sizebuf_t *msg, int bits ) { int i, newnum, pack; qboolean forcelink; @@ -565,7 +565,7 @@ CL_ParseQuakeParticles ================== */ -void CL_ParseQuakeParticle( sizebuf_t *msg ) +static void CL_ParseQuakeParticle( sizebuf_t *msg ) { int count, color; vec3_t org, dir; @@ -587,7 +587,7 @@ CL_ParseQuakeStaticSound =================== */ -void CL_ParseQuakeStaticSound( sizebuf_t *msg ) +static void CL_ParseQuakeStaticSound( sizebuf_t *msg ) { int sound_num; float vol, attn; @@ -816,7 +816,7 @@ CL_QuakeStuffText ================== */ -void CL_QuakeStuffText( const char *text ) +static void CL_QuakeStuffText( const char *text ) { Q_strncat( cmd_buf, text, sizeof( cmd_buf )); @@ -831,7 +831,7 @@ CL_QuakeExecStuff ================== */ -void CL_QuakeExecStuff( void ) +static void CL_QuakeExecStuff( void ) { char *text = cmd_buf; char token[256]; diff --git a/engine/client/cl_render.c b/engine/client/cl_render.c index 660f7531..1d8dc478 100644 --- a/engine/client/cl_render.c +++ b/engine/client/cl_render.c @@ -126,7 +126,7 @@ CL_GenericHandle ============= */ -const char *CL_GenericHandle( int fileindex ) +static const char *CL_GenericHandle( int fileindex ) { if( fileindex < 0 || fileindex >= MAX_CUSTOM ) return 0; diff --git a/engine/client/cl_scrn.c b/engine/client/cl_scrn.c index 5145d735..e7305378 100644 --- a/engine/client/cl_scrn.c +++ b/engine/client/cl_scrn.c @@ -252,7 +252,7 @@ VID_WriteOverviewScript Create overview script file =============== */ -void VID_WriteOverviewScript( void ) +static void VID_WriteOverviewScript( void ) { ref_overview_t *ov = &clgame.overView; string filename; @@ -344,7 +344,7 @@ void SCR_MakeScreenShot( void ) SCR_DrawPlaque ================ */ -void SCR_DrawPlaque( void ) +static void SCR_DrawPlaque( void ) { if(( cl_allow_levelshots.value && !cls.changelevel ) || cl.background ) { @@ -675,7 +675,7 @@ SCR_SizeUp_f Keybinding command ================= */ -void SCR_SizeUp_f( void ) +static void SCR_SizeUp_f( void ) { Cvar_SetValue( "viewsize", Q_min( scr_viewsize.value + 10, 120 )); } @@ -688,7 +688,7 @@ SCR_SizeDown_f Keybinding command ================= */ -void SCR_SizeDown_f( void ) +static void SCR_SizeDown_f( void ) { Cvar_SetValue( "viewsize", Q_max( scr_viewsize.value - 10, 30 )); } diff --git a/engine/client/cl_tent.c b/engine/client/cl_tent.c index fd37d6d3..e556bc2f 100644 --- a/engine/client/cl_tent.c +++ b/engine/client/cl_tent.c @@ -255,7 +255,7 @@ CL_PrepareTEnt set default values ============== */ -void CL_PrepareTEnt( TEMPENTITY *pTemp, model_t *pmodel ) +static void CL_PrepareTEnt( TEMPENTITY *pTemp, model_t *pmodel ) { int frameCount = 0; int modelIndex = 0; @@ -296,7 +296,7 @@ CL_TempEntPlaySound play collide sound ============== */ -void CL_TempEntPlaySound( TEMPENTITY *pTemp, float damp ) +static void CL_TempEntPlaySound( TEMPENTITY *pTemp, float damp ) { float fvol; char soundname[32]; @@ -380,7 +380,7 @@ CL_TEntAddEntity add entity to renderlist ============== */ -int CL_TempEntAddEntity( cl_entity_t *pEntity ) +static int CL_TempEntAddEntity( cl_entity_t *pEntity ) { vec3_t mins, maxs; @@ -432,7 +432,7 @@ CL_TEntAddEntity free the first low priority tempent it finds. ============== */ -qboolean CL_FreeLowPriorityTempEnt( void ) +static qboolean CL_FreeLowPriorityTempEnt( void ) { TEMPENTITY *pActive = cl_active_tents; TEMPENTITY *pPrev = NULL; @@ -2414,7 +2414,7 @@ LIGHT STYLE MANAGEMENT CL_ClearLightStyles ================ */ -void CL_ClearLightStyles( void ) +static void CL_ClearLightStyles( void ) { memset( cl.lightstyles, 0, sizeof( cl.lightstyles )); } @@ -2472,7 +2472,7 @@ dlight_t cl_elights[MAX_ELIGHTS]; CL_ClearDlights ================ */ -void CL_ClearDlights( void ) +static void CL_ClearDlights( void ) { memset( cl_dlights, 0, sizeof( cl_dlights )); memset( cl_elights, 0, sizeof( cl_elights )); diff --git a/engine/client/cl_video.c b/engine/client/cl_video.c index b85e7326..d3ec40aa 100644 --- a/engine/client/cl_video.c +++ b/engine/client/cl_video.c @@ -68,7 +68,7 @@ qboolean SCR_NextMovie( void ) return true; } -void SCR_CreateStartupVids( void ) +static void SCR_CreateStartupVids( void ) { file_t *f; diff --git a/engine/client/cl_view.c b/engine/client/cl_view.c index 79f0bf7f..3fe1eeb7 100644 --- a/engine/client/cl_view.c +++ b/engine/client/cl_view.c @@ -29,7 +29,7 @@ V_CalcViewRect calc frame rectangle (Quake1 style) =============== */ -void V_CalcViewRect( void ) +static void V_CalcViewRect( void ) { qboolean full = false; int sb_lines; @@ -88,7 +88,7 @@ void V_CalcViewRect( void ) V_SetupViewModel =============== */ -void V_SetupViewModel( void ) +static void V_SetupViewModel( void ) { cl_entity_t *view = &clgame.viewent; player_info_t *info = &cl.players[cl.playernum]; @@ -118,7 +118,7 @@ void V_SetupViewModel( void ) V_SetRefParams =============== */ -void V_SetRefParams( ref_params_t *fd ) +static void V_SetRefParams( ref_params_t *fd ) { memset( fd, 0, sizeof( ref_params_t )); @@ -182,7 +182,7 @@ V_MergeOverviewRefdef merge refdef with overview settings =============== */ -void V_RefApplyOverview( ref_viewpass_t *rvp ) +static void V_RefApplyOverview( ref_viewpass_t *rvp ) { ref_overview_t *ov = &clgame.overView; float aspect; @@ -281,7 +281,7 @@ static void V_AdjustFov( float *fov_x, float *fov_y, float width, float height, V_GetRefParams ============= */ -void V_GetRefParams( ref_params_t *fd, ref_viewpass_t *rvp ) +static void V_GetRefParams( ref_params_t *fd, ref_viewpass_t *rvp ) { // part1: deniable updates VectorCopy( fd->simvel, cl.simvel ); @@ -408,14 +408,14 @@ void V_RenderView( void ) #define NODE_INTERVAL_X(x) (x * 16.0f) #define NODE_INTERVAL_Y(x) (x * 16.0f) -void R_DrawLeafNode( float x, float y, float scale ) +static void R_DrawLeafNode( float x, float y, float scale ) { float downScale = scale * 0.25f;// * POINT_SIZE; ref.dllFuncs.R_DrawStretchPic( x - downScale * 0.5f, y - downScale * 0.5f, downScale, downScale, 0, 0, 1, 1, R_GetBuiltinTexture( REF_PARTICLE_TEXTURE ) ); } -void R_DrawNodeConnection( float x, float y, float x2, float y2 ) +static void R_DrawNodeConnection( float x, float y, float x2, float y2 ) { ref.dllFuncs.Begin( TRI_LINES ); ref.dllFuncs.Vertex3f( x, y, 0 ); @@ -423,7 +423,7 @@ void R_DrawNodeConnection( float x, float y, float x2, float y2 ) ref.dllFuncs.End( ); } -void R_ShowTree_r( mnode_t *node, float x, float y, float scale, int shownodes, mleaf_t *viewleaf ) +static void R_ShowTree_r( mnode_t *node, float x, float y, float scale, int shownodes, mleaf_t *viewleaf ) { float downScale = scale * 0.8f; @@ -470,7 +470,7 @@ void R_ShowTree_r( mnode_t *node, float x, float y, float scale, int shownodes, world.recursion_level--; } -void R_ShowTree( void ) +static void R_ShowTree( void ) { float x = (float)((refState.width - (int)POINT_SIZE) >> 1); float y = NODE_INTERVAL_Y(1.0f); diff --git a/engine/client/console.c b/engine/client/console.c index e08c15bd..67463a49 100644 --- a/engine/client/console.c +++ b/engine/client/console.c @@ -151,7 +151,7 @@ static void Con_SaveHistory( con_history_t *self ); Con_Clear_f ================ */ -void Con_Clear_f( void ) +static void Con_Clear_f( void ) { con.lines_count = 0; con.backscroll = 0; // go to end @@ -206,7 +206,7 @@ void Con_ClearNotify( void ) Con_ClearTyping ================ */ -void Con_ClearTyping( void ) +static void Con_ClearTyping( void ) { Con_ClearField( &con.input ); con.input.widthInChars = con.linewidth; @@ -219,7 +219,7 @@ void Con_ClearTyping( void ) Con_MessageMode_f ================ */ -void Con_MessageMode_f( void ) +static void Con_MessageMode_f( void ) { g_messagemode_privileged = Cmd_CurrentCommandIsPrivileged(); @@ -235,7 +235,7 @@ void Con_MessageMode_f( void ) Con_MessageMode2_f ================ */ -void Con_MessageMode2_f( void ) +static void Con_MessageMode2_f( void ) { g_messagemode_privileged = Cmd_CurrentCommandIsPrivileged(); @@ -280,7 +280,7 @@ void Con_ToggleConsole_f( void ) Con_SetTimes_f ================ */ -void Con_SetTimes_f( void ) +static void Con_SetTimes_f( void ) { int newtimes; @@ -303,7 +303,7 @@ Notifies the console code about the current time went backwards) ================ */ -void Con_FixTimes( void ) +static void Con_FixTimes( void ) { double diff; int i; @@ -324,7 +324,7 @@ Con_DeleteLine Deletes the first line from the console history. ================ */ -void Con_DeleteLine( void ) +static void Con_DeleteLine( void ) { if( con.lines_count == 0 ) return; @@ -339,7 +339,7 @@ Con_DeleteLastLine Deletes the last line from the console history. ================ */ -void Con_DeleteLastLine( void ) +static void Con_DeleteLastLine( void ) { if( con.lines_count == 0 ) return; @@ -398,7 +398,7 @@ Con_AddLine Appends a given string as a new line to the console. ================ */ -void Con_AddLine( const char *line, int length, qboolean newline ) +static void Con_AddLine( const char *line, int length, qboolean newline ) { char *putpos; con_lineinfo_t *p; @@ -444,7 +444,7 @@ Con_CheckResize If the line width has changed, reformat the buffer. ================ */ -void Con_CheckResize( void ) +static void Con_CheckResize( void ) { int charWidth = 8; int i, width; @@ -1143,7 +1143,7 @@ static void Field_Set( field_t *f, const char *string ) Field_Paste ================ */ -void Field_Paste( field_t *edit ) +static void Field_Paste( field_t *edit ) { char *cbd; int i, pasteLen; @@ -1179,7 +1179,7 @@ in-game talk, and menu fields Key events are used for non-printable characters, others are gotten from char events. ================= */ -void Field_KeyDownEvent( field_t *edit, int key ) +static void Field_KeyDownEvent( field_t *edit, int key ) { int len; @@ -1311,7 +1311,7 @@ void Field_CharEvent( field_t *edit, int ch ) Field_DrawInputLine ================== */ -void Field_DrawInputLine( int x, int y, field_t *edit ) +static void Field_DrawInputLine( int x, int y, field_t *edit ) { int len, cursorChar; int drawLen; @@ -1683,7 +1683,7 @@ Con_DrawInput The input line scrolls horizontally if typing goes beyond the right edge ================ */ -void Con_DrawInput( int lines ) +static void Con_DrawInput( int lines ) { int y; @@ -1703,7 +1703,7 @@ Con_DrawDebugLines Custom debug messages ================ */ -int Con_DrawDebugLines( void ) +static int Con_DrawDebugLines( void ) { notify_t *notify = con.notify; int i, count = 0; @@ -1788,7 +1788,7 @@ Con_DrawNotify Draws the last few lines of output transparently over the game top ================ */ -void Con_DrawNotify( void ) +static void Con_DrawNotify( void ) { double time = cl.time; int i, x, y = 0; @@ -1840,7 +1840,7 @@ If alpha is 0, the line is not drawn, but still wrapped and its height returned. ================ */ -int Con_DrawConsoleLine( int y, int lineno ) +static int Con_DrawConsoleLine( int y, int lineno ) { con_lineinfo_t *li = &CON_LINES( lineno ); @@ -1895,7 +1895,7 @@ Con_DrawConsole Draws the console with the solid background ================ */ -void Con_DrawSolidConsole( int lines ) +static void Con_DrawSolidConsole( int lines ) { int i, x, y; float fraction; diff --git a/engine/client/in_touch.c b/engine/client/in_touch.c index a2ed8163..62bf9089 100644 --- a/engine/client/in_touch.c +++ b/engine/client/in_touch.c @@ -252,7 +252,7 @@ Touch_DumpConfig Dump config to file ================= */ -qboolean Touch_DumpConfig( const char *name, const char *profilename ) +static qboolean Touch_DumpConfig( const char *name, const char *profilename ) { file_t *f; touch_button_t *button; diff --git a/engine/client/input.c b/engine/client/input.c index f1e13dc6..f0536462 100644 --- a/engine/client/input.c +++ b/engine/client/input.c @@ -107,7 +107,7 @@ void IN_LockInputDevices( qboolean lock ) IN_StartupMouse =========== */ -void IN_StartupMouse( void ) +static void IN_StartupMouse( void ) { Cvar_RegisterVariable( &m_ignore ); @@ -206,7 +206,7 @@ void IN_ToggleClientMouse( int newstate, int oldstate ) } } -void IN_CheckMouseState( qboolean active ) +static void IN_CheckMouseState( qboolean active ) { static qboolean s_bRawInput, s_bMouseGrab; @@ -313,7 +313,7 @@ void IN_DeactivateMouse( void ) IN_MouseMove ================ */ -void IN_MouseMove( void ) +static void IN_MouseMove( void ) { int x, y; @@ -588,7 +588,7 @@ void IN_EngineAppendMove( float frametime, void *cmd1, qboolean active ) } } -void IN_Commands( void ) +static void IN_Commands( void ) { #if XASH_USE_EVDEV IN_EvdevFrame(); diff --git a/engine/client/keys.c b/engine/client/keys.c index fcd69afb..fda8ce62 100644 --- a/engine/client/keys.c +++ b/engine/client/keys.c @@ -332,7 +332,7 @@ int Key_GetKey( const char *pBinding ) Key_Unbind_f =================== */ -void Key_Unbind_f( void ) +static void Key_Unbind_f( void ) { int b; @@ -358,7 +358,7 @@ void Key_Unbind_f( void ) Key_Unbindall_f =================== */ -void Key_Unbindall_f( void ) +static void Key_Unbindall_f( void ) { int i; @@ -378,7 +378,7 @@ void Key_Unbindall_f( void ) Key_Reset_f =================== */ -void Key_Reset_f( void ) +static void Key_Reset_f( void ) { keyname_t *kn; int i; @@ -400,7 +400,7 @@ void Key_Reset_f( void ) Key_Bind_f =================== */ -void Key_Bind_f( void ) +static void Key_Bind_f( void ) { char cmd[1024]; int i, c, b; @@ -473,7 +473,7 @@ Key_Bindlist_f ============ */ -void Key_Bindlist_f( void ) +static void Key_Bindlist_f( void ) { int i; @@ -523,7 +523,7 @@ void Key_Init( void ) Key_AddKeyCommands =================== */ -void Key_AddKeyCommands( int key, const char *kb, qboolean down ) +static void Key_AddKeyCommands( int key, const char *kb, qboolean down ) { char button[1024]; char *buttonPtr; diff --git a/engine/client/s_main.c b/engine/client/s_main.c index 7d9a2455..2feeb81b 100644 --- a/engine/client/s_main.c +++ b/engine/client/s_main.c @@ -91,7 +91,7 @@ void S_FadeClientVolume( float fadePercent, float fadeOutSeconds, float holdTime S_IsClient ================= */ -qboolean S_IsClient( int entnum ) +static qboolean S_IsClient( int entnum ) { return ( entnum == s_listener.entnum ); } @@ -124,7 +124,7 @@ void S_FreeChannel( channel_t *ch ) S_UpdateSoundFade ================= */ -void S_UpdateSoundFade( void ) +static void S_UpdateSoundFade( void ) { float f, totaltime, elapsed; @@ -184,7 +184,7 @@ override any other sound playing on the same channel (see code comments below fo exceptions). ================= */ -qboolean SND_FStreamIsPlaying( sfx_t *sfx ) +static qboolean SND_FStreamIsPlaying( sfx_t *sfx ) { int ch_idx; @@ -399,7 +399,7 @@ returns TRUE if sound was altered, returns FALSE if sound was not found (sound is not playing) ================= */ -int S_AlterChannel( int entnum, int channel, sfx_t *sfx, int vol, int pitch, int flags ) +static int S_AlterChannel( int entnum, int channel, sfx_t *sfx, int vol, int pitch, int flags ) { channel_t *ch; int i; @@ -457,7 +457,7 @@ int S_AlterChannel( int entnum, int channel, sfx_t *sfx, int vol, int pitch, int S_SpatializeChannel ================= */ -void S_SpatializeChannel( int *left_vol, int *right_vol, int master_vol, float gain, float dot, float dist ) +static void S_SpatializeChannel( int *left_vol, int *right_vol, int master_vol, float gain, float dot, float dist ) { float lscale, rscale, scale; @@ -480,7 +480,7 @@ void S_SpatializeChannel( int *left_vol, int *right_vol, int master_vol, float g SND_Spatialize ================= */ -void SND_Spatialize( channel_t *ch ) +static void SND_Spatialize( channel_t *ch ) { vec3_t source_vec; float dist, dot, gain = 1.0f; @@ -953,7 +953,7 @@ int S_GetCurrentDynamicSounds( soundlist_t *pout, int size ) S_InitAmbientChannels =================== */ -void S_InitAmbientChannels( void ) +static void S_InitAmbientChannels( void ) { int ambient_channel; channel_t *chan; @@ -975,7 +975,7 @@ void S_InitAmbientChannels( void ) S_UpdateAmbientSounds =================== */ -void S_UpdateAmbientSounds( void ) +static void S_UpdateAmbientSounds( void ) { mleaf_t *leaf; float vol; @@ -1407,7 +1407,7 @@ static void S_FreeRawChannels( void ) S_ClearBuffer ================== */ -void S_ClearBuffer( void ) +static void S_ClearBuffer( void ) { S_ClearRawChannels(); @@ -1506,7 +1506,7 @@ static int S_GetSoundtime( void ) } //============================================================================= -void S_UpdateChannels( void ) +static void S_UpdateChannels( void ) { uint endtime; int samps; @@ -1695,7 +1695,7 @@ console functions =============================================================================== */ -void S_Play_f( void ) +static void S_Play_f( void ) { if( Cmd_Argc() == 1 ) { @@ -1706,7 +1706,7 @@ void S_Play_f( void ) S_StartLocalSound( Cmd_Argv( 1 ), VOL_NORM, false ); } -void S_Play2_f( void ) +static void S_Play2_f( void ) { int i = 1; @@ -1723,7 +1723,7 @@ void S_Play2_f( void ) } } -void S_PlayVol_f( void ) +static void S_PlayVol_f( void ) { if( Cmd_Argc() == 1 ) { @@ -1749,7 +1749,7 @@ static void S_Say( const char *name, qboolean reliable ) S_StartLocalSound( sentence, 1.0f, reliable ); } -void S_Say_f( void ) +static void S_Say_f( void ) { if( Cmd_Argc() == 1 ) { @@ -1760,7 +1760,7 @@ void S_Say_f( void ) S_Say( Cmd_Argv( 1 ), false ); } -void S_SayReliable_f( void ) +static void S_SayReliable_f( void ) { if( Cmd_Argc() == 1 ) { @@ -1776,7 +1776,7 @@ void S_SayReliable_f( void ) S_Music_f ================= */ -void S_Music_f( void ) +static void S_Music_f( void ) { int c = Cmd_Argc(); @@ -1840,7 +1840,7 @@ void S_Music_f( void ) S_StopSound_f ================= */ -void S_StopSound_f( void ) +static void S_StopSound_f( void ) { S_StopAllSounds( true ); } @@ -1850,7 +1850,7 @@ void S_StopSound_f( void ) S_SoundFade_f ================= */ -void S_SoundFade_f( void ) +static void S_SoundFade_f( void ) { int c = Cmd_Argc(); float fadeTime = 5.0f; @@ -1884,7 +1884,7 @@ void S_SoundInfo_f( void ) S_VoiceRecordStart_f ================= */ -void S_VoiceRecordStart_f( void ) +static void S_VoiceRecordStart_f( void ) { if( cls.state != ca_active || cls.legacymode ) return; @@ -1897,7 +1897,7 @@ void S_VoiceRecordStart_f( void ) S_VoiceRecordStop_f ================= */ -void S_VoiceRecordStop_f( void ) +static void S_VoiceRecordStop_f( void ) { if( cls.state != ca_active || !Voice_IsRecording() ) return; diff --git a/engine/client/s_mix.c b/engine/client/s_mix.c index 50164475..281c4f22 100644 --- a/engine/client/s_mix.c +++ b/engine/client/s_mix.c @@ -58,7 +58,7 @@ S_TransferPaintBuffer =================== */ -void S_TransferPaintBuffer( int endtime ) +static void S_TransferPaintBuffer( int endtime ) { int *snd_p, snd_linear_count; int lpos, lpaintedtime; @@ -201,7 +201,7 @@ CHANNEL MIXING =============================================================================== */ -void S_PaintMonoFrom8( portable_samplepair_t *pbuf, int *volume, byte *pData, int outCount ) +static void S_PaintMonoFrom8( portable_samplepair_t *pbuf, int *volume, byte *pData, int outCount ) { int *lscale, *rscale; int i, data; @@ -217,7 +217,7 @@ void S_PaintMonoFrom8( portable_samplepair_t *pbuf, int *volume, byte *pData, in } } -void S_PaintStereoFrom8( portable_samplepair_t *pbuf, int *volume, byte *pData, int outCount ) +static void S_PaintStereoFrom8( portable_samplepair_t *pbuf, int *volume, byte *pData, int outCount ) { int *lscale, *rscale; uint left, right; @@ -237,7 +237,7 @@ void S_PaintStereoFrom8( portable_samplepair_t *pbuf, int *volume, byte *pData, } } -void S_PaintMonoFrom16( portable_samplepair_t *pbuf, int *volume, short *pData, int outCount ) +static void S_PaintMonoFrom16( portable_samplepair_t *pbuf, int *volume, short *pData, int outCount ) { int left, right; int i, data; @@ -252,7 +252,7 @@ void S_PaintMonoFrom16( portable_samplepair_t *pbuf, int *volume, short *pData, } } -void S_PaintStereoFrom16( portable_samplepair_t *pbuf, int *volume, short *pData, int outCount ) +static void S_PaintStereoFrom16( portable_samplepair_t *pbuf, int *volume, short *pData, int outCount ) { uint *data; int left, right; @@ -273,11 +273,11 @@ void S_PaintStereoFrom16( portable_samplepair_t *pbuf, int *volume, short *pData } } -void S_Mix8MonoTimeCompress( portable_samplepair_t *pbuf, int *volume, byte *pData, int inputOffset, uint rateScale, int outCount, int timecompress ) +static void S_Mix8MonoTimeCompress( portable_samplepair_t *pbuf, int *volume, byte *pData, int inputOffset, uint rateScale, int outCount, int timecompress ) { } -void S_Mix8Mono( portable_samplepair_t *pbuf, int *volume, byte *pData, int inputOffset, uint rateScale, int outCount, int timecompress ) +static void S_Mix8Mono( portable_samplepair_t *pbuf, int *volume, byte *pData, int inputOffset, uint rateScale, int outCount, int timecompress ) { int i, sampleIndex = 0; uint sampleFrac = inputOffset; @@ -309,7 +309,7 @@ void S_Mix8Mono( portable_samplepair_t *pbuf, int *volume, byte *pData, int inpu } } -void S_Mix8Stereo( portable_samplepair_t *pbuf, int *volume, byte *pData, int inputOffset, uint rateScale, int outCount ) +static void S_Mix8Stereo( portable_samplepair_t *pbuf, int *volume, byte *pData, int inputOffset, uint rateScale, int outCount ) { int i, sampleIndex = 0; uint sampleFrac = inputOffset; @@ -335,7 +335,7 @@ void S_Mix8Stereo( portable_samplepair_t *pbuf, int *volume, byte *pData, int in } } -void S_Mix16Mono( portable_samplepair_t *pbuf, int *volume, short *pData, int inputOffset, uint rateScale, int outCount ) +static void S_Mix16Mono( portable_samplepair_t *pbuf, int *volume, short *pData, int inputOffset, uint rateScale, int outCount ) { int i, sampleIndex = 0; uint sampleFrac = inputOffset; @@ -357,7 +357,7 @@ void S_Mix16Mono( portable_samplepair_t *pbuf, int *volume, short *pData, int in } } -void S_Mix16Stereo( portable_samplepair_t *pbuf, int *volume, short *pData, int inputOffset, uint rateScale, int outCount ) +static void S_Mix16Stereo( portable_samplepair_t *pbuf, int *volume, short *pData, int inputOffset, uint rateScale, int outCount ) { int i, sampleIndex = 0; uint sampleFrac = inputOffset; @@ -379,7 +379,7 @@ void S_Mix16Stereo( portable_samplepair_t *pbuf, int *volume, short *pData, int } } -void S_MixChannel( channel_t *pChannel, void *pData, int outputOffset, int inputOffset, uint fracRate, int outCount, int timecompress ) +static void S_MixChannel( channel_t *pChannel, void *pData, int outputOffset, int inputOffset, uint fracRate, int outCount, int timecompress ) { int pvol[CCHANVOLUMES]; paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr(); @@ -496,7 +496,7 @@ int S_MixDataToDevice( channel_t *pChannel, int sampleCount, int outRate, int ou return outOffset - startingOffset; } -qboolean S_ShouldContinueMixing( channel_t *ch ) +static qboolean S_ShouldContinueMixing( channel_t *ch ) { if( ch->isSentence ) { @@ -517,7 +517,7 @@ qboolean S_ShouldContinueMixing( channel_t *ch ) // this routine will fill the paintbuffer to endtime. Otherwise, fewer samples are mixed. // if( endtime - paintedtime ) is not aligned on boundaries of 4, // we'll miss data if outputRate < SOUND_DMA_SPEED! -void MIX_MixChannelsToPaintbuffer( int endtime, int rate, int outputRate ) +static void MIX_MixChannelsToPaintbuffer( int endtime, int rate, int outputRate ) { channel_t *ch; wavdata_t *pSource; @@ -647,7 +647,7 @@ _inline portable_samplepair_t *S_GetNextpFilter( int i, portable_samplepair_t *p // if NULL then perform no filtering. // count: how many samples to upsample. will become count*2 samples in buffer, in place. -void S_Interpolate2xCubic( portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem, int cfltmem, int count ) +static void S_Interpolate2xCubic( portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem, int cfltmem, int count ) { // implement cubic interpolation on 2x upsampled buffer. Effectively delays buffer contents by 2 samples. @@ -740,7 +740,7 @@ void S_Interpolate2xCubic( portable_samplepair_t *pbuffer, portable_samplepair_t // prevfilter: filter memory. NOTE: this must match the filtertype ie: filterlinear[] for FILTERTYPE_LINEAR // if NULL then perform no filtering. // count: how many samples to upsample. will become count*2 samples in buffer, in place. -void S_Interpolate2xLinear( portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem, int cfltmem, int count ) +static void S_Interpolate2xLinear( portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem, int cfltmem, int count ) { int i, upCount = count<<1; @@ -769,7 +769,7 @@ void S_Interpolate2xLinear( portable_samplepair_t *pbuffer, portable_samplepair_ // if NULL then perform no filtering. // cfltmem: max number of sample pairs filter can use // filtertype: FILTERTYPE_NONE, _LINEAR, _CUBIC etc. Must match prevfilter. -void S_MixBufferUpsample2x( int count, portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem, int cfltmem, int filtertype ) +static void S_MixBufferUpsample2x( int count, portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem, int cfltmem, int filtertype ) { int upCount = count<<1; int i, j; @@ -822,7 +822,7 @@ void MIX_ClearAllPaintBuffers( int SampleCount, qboolean clearFilters ) // mixes pbuf1 + pbuf2 into pbuf3, count samples // fgain is output gain 0-1.0 // NOTE: pbuf3 may equal pbuf1 or pbuf2! -void MIX_MixPaintbuffers( int ibuf1, int ibuf2, int ibuf3, int count, float fgain ) +static void MIX_MixPaintbuffers( int ibuf1, int ibuf2, int ibuf3, int count, float fgain ) { portable_samplepair_t *pbuf1, *pbuf2, *pbuf3; int i, gain; @@ -855,7 +855,7 @@ void MIX_MixPaintbuffers( int ibuf1, int ibuf2, int ibuf3, int count, float fgai } } -void MIX_CompressPaintbuffer( int ipaint, int count ) +static void MIX_CompressPaintbuffer( int ipaint, int count ) { portable_samplepair_t *pbuf; paintbuffer_t *ppaint; @@ -871,7 +871,7 @@ void MIX_CompressPaintbuffer( int ipaint, int count ) } } -void S_MixUpsample( int sampleCount, int filtertype ) +static void S_MixUpsample( int sampleCount, int filtertype ) { paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr(); int ifilter = ppaint->ifilter; @@ -884,7 +884,7 @@ void S_MixUpsample( int sampleCount, int filtertype ) ppaint->ifilter++; } -void MIX_MixRawSamplesBuffer( int end ) +static void MIX_MixRawSamplesBuffer( int end ) { portable_samplepair_t *pbuf, *roombuf, *streambuf; uint i, j, stop; @@ -928,7 +928,7 @@ void MIX_MixRawSamplesBuffer( int end ) // IROOMBUFFER, IFACINGBUFFER, IFACINGAWAY // dsp fx are then applied to these buffers by the caller. // caller also remixes all into final IPAINTBUFFER output. -void MIX_UpsampleAllPaintbuffers( int end, int count ) +static void MIX_UpsampleAllPaintbuffers( int end, int count ) { // 11khz sounds are mixed into 3 buffers based on distance from listener, and facing direction // These buffers are facing, facingaway, room diff --git a/engine/common/cfgscript.c b/engine/common/cfgscript.c index 56bd8006..331bdad2 100644 --- a/engine/common/cfgscript.c +++ b/engine/common/cfgscript.c @@ -52,7 +52,7 @@ CSCR_ExpectString Return true if next token is pExpext and skip it =================== */ -qboolean CSCR_ExpectString( parserstate_t *ps, const char *pExpect, qboolean skip, qboolean error ) +static qboolean CSCR_ExpectString( parserstate_t *ps, const char *pExpect, qboolean skip, qboolean error ) { char *tmp = COM_ParseFile( ps->buf, ps->token, sizeof( ps->token )); @@ -75,7 +75,7 @@ CSCR_ParseType Determine script variable type =================== */ -cvartype_t CSCR_ParseType( parserstate_t *ps ) +static cvartype_t CSCR_ParseType( parserstate_t *ps ) { int i; @@ -96,7 +96,7 @@ cvartype_t CSCR_ParseType( parserstate_t *ps ) CSCR_ParseSingleCvar ========================= */ -qboolean CSCR_ParseSingleCvar( parserstate_t *ps, scrvardef_t *result ) +static qboolean CSCR_ParseSingleCvar( parserstate_t *ps, scrvardef_t *result ) { // read the name ps->buf = COM_ParseFile( ps->buf, result->name, sizeof( result->name )); @@ -170,7 +170,7 @@ CSCR_ParseHeader Check version and seek to first cvar name ====================== */ -qboolean CSCR_ParseHeader( parserstate_t *ps ) +static qboolean CSCR_ParseHeader( parserstate_t *ps ) { if( !CSCR_ExpectString( ps, "VERSION", false, true )) return false; diff --git a/engine/common/cmd.c b/engine/common/cmd.c index 55a62fca..77af861a 100644 --- a/engine/common/cmd.c +++ b/engine/common/cmd.c @@ -79,7 +79,7 @@ void Cbuf_Clear( void ) Cbuf_GetSpace ============ */ -void *Cbuf_GetSpace( cmdbuf_t *buf, int length ) +static void *Cbuf_GetSpace( cmdbuf_t *buf, int length ) { void *data; @@ -176,7 +176,7 @@ void Cbuf_InsertText( const char *text ) Cbuf_Execute ============ */ -void Cbuf_ExecuteCommandsFromBuffer( cmdbuf_t *buf, qboolean isPrivileged, int cmdsToExecute ) +static void Cbuf_ExecuteCommandsFromBuffer( cmdbuf_t *buf, qboolean isPrivileged, int cmdsToExecute ) { char *text; char line[MAX_CMD_LINE]; @@ -356,7 +356,7 @@ hl.exe -dev 3 +map c1a0d hl.exe -nosound -game bshift =============== */ -void Cmd_StuffCmds_f( void ) +static void Cmd_StuffCmds_f( void ) { host.stuffcmds_pending = true; } @@ -370,7 +370,7 @@ next frame. This allows commands like: bind g "cmd use rocket ; +attack ; wait ; -attack ; cmd use blaster" ============ */ -void Cmd_Wait_f( void ) +static void Cmd_Wait_f( void ) { cmd_wait = true; } @@ -382,7 +382,7 @@ Cmd_Echo_f Just prints the rest of the line to the console =============== */ -void Cmd_Echo_f( void ) +static void Cmd_Echo_f( void ) { int i; @@ -398,7 +398,7 @@ Cmd_Alias_f Creates a new command that executes a command string (possibly ; seperated) =============== */ -void Cmd_Alias_f( void ) +static void Cmd_Alias_f( void ) { cmdalias_t *a; char cmd[MAX_CMD_LINE]; @@ -882,7 +882,7 @@ Cmd_If_f Compare and et condition bit if true ============ */ -void Cmd_If_f( void ) +static void Cmd_If_f( void ) { // reset bit first cmd_condition &= ~BIT( cmd_condlevel ); @@ -943,7 +943,7 @@ Cmd_Else_f Invert condition bit ============ */ -void Cmd_Else_f( void ) +static void Cmd_Else_f( void ) { cmd_condition ^= BIT( cmd_condlevel ); } @@ -1179,7 +1179,7 @@ void Cmd_ForwardToServer( void ) Cmd_List_f ============ */ -void Cmd_List_f( void ) +static void Cmd_List_f( void ) { cmd_t *cmd; int i = 0; diff --git a/engine/common/con_utils.c b/engine/common/con_utils.c index 7a763d9e..669cc7bc 100644 --- a/engine/common/con_utils.c +++ b/engine/common/con_utils.c @@ -314,7 +314,7 @@ Cmd_GetMusicList Prints or complete background track filename ===================================== */ -qboolean Cmd_GetMusicList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetMusicList( const char *s, char *completedname, int length ) { search_t *t; string matchbuf; @@ -362,7 +362,7 @@ Cmd_GetSavesList Prints or complete savegame filename ===================================== */ -qboolean Cmd_GetSavesList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetSavesList( const char *s, char *completedname, int length ) { search_t *t; string matchbuf; @@ -409,7 +409,7 @@ Cmd_GetConfigList Prints or complete .cfg filename ===================================== */ -qboolean Cmd_GetConfigList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetConfigList( const char *s, char *completedname, int length ) { search_t *t; string matchbuf; @@ -456,7 +456,7 @@ Cmd_GetSoundList Prints or complete sound filename ===================================== */ -qboolean Cmd_GetSoundList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetSoundList( const char *s, char *completedname, int length ) { search_t *t; string matchbuf; @@ -508,7 +508,7 @@ Cmd_GetItemsList Prints or complete item classname (weapons only) ===================================== */ -qboolean Cmd_GetItemsList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetItemsList( const char *s, char *completedname, int length ) { search_t *t; string matchbuf; @@ -555,7 +555,7 @@ Cmd_GetKeysList Autocomplete for bind command ===================================== */ -qboolean Cmd_GetKeysList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetKeysList( const char *s, char *completedname, int length ) { size_t i, numkeys; string keys[256]; @@ -636,7 +636,7 @@ Cmd_GetCommandsList Autocomplete for bind command ===================================== */ -qboolean Cmd_GetCommandsList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetCommandsList( const char *s, char *completedname, int length ) { size_t i; string matchbuf; @@ -701,7 +701,7 @@ Cmd_GetCustomList Prints or complete .HPK filenames ===================================== */ -qboolean Cmd_GetCustomList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetCustomList( const char *s, char *completedname, int length ) { search_t *t; string matchbuf; @@ -747,7 +747,7 @@ Cmd_GetGameList Prints or complete gamedir name ===================================== */ -qboolean Cmd_GetGamesList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetGamesList( const char *s, char *completedname, int length ) { int i, numgamedirs; string gamedirs[MAX_MODS]; @@ -800,7 +800,7 @@ Cmd_GetCDList Prints or complete CD command name ===================================== */ -qboolean Cmd_GetCDList( const char *s, char *completedname, int length ) +static qboolean Cmd_GetCDList( const char *s, char *completedname, int length ) { int i, numcdcommands; string cdcommands[8]; @@ -854,7 +854,7 @@ qboolean Cmd_GetCDList( const char *s, char *completedname, int length ) return true; } -qboolean Cmd_CheckMapsList_R( qboolean fRefresh, qboolean onlyingamedir ) +static qboolean Cmd_CheckMapsList_R( qboolean fRefresh, qboolean onlyingamedir ) { qboolean use_filter = false; byte buf[MAX_SYSPATH]; @@ -1345,13 +1345,13 @@ static void Cmd_WriteHelp(const char *name, const char *unused, const char *desc if( length == 0 ) FS_Printf( f, "%s \"%s\"\n", name, desc ); } -void Cmd_WriteOpenGLVariables( file_t *f ) +static void Cmd_WriteOpenGLVariables( file_t *f ) { Cvar_LookupVars( FCVAR_GLCONFIG, NULL, f, (setpair_t)Cmd_WriteOpenGLCvar ); } #if !XASH_DEDICATED -void Host_FinalizeConfig( file_t *f, const char *config ) +static void Host_FinalizeConfig( file_t *f, const char *config ) { string backup, newcfg; diff --git a/engine/common/cvar.c b/engine/common/cvar.c index 24d71ecb..027cca65 100644 --- a/engine/common/cvar.c +++ b/engine/common/cvar.c @@ -195,7 +195,7 @@ Cvar_ValidateString deal with userinfo etc ============ */ -const char *Cvar_ValidateString( convar_t *var, const char *value ) +static const char *Cvar_ValidateString( convar_t *var, const char *value ) { const char *pszValue; static char szNew[MAX_STRING]; @@ -278,7 +278,7 @@ Cvar_UnlinkVar unlink the variable ============ */ -int Cvar_UnlinkVar( const char *var_name, int group ) +static int Cvar_UnlinkVar( const char *var_name, int group ) { int count = 0; convar_t **prev; @@ -1091,7 +1091,7 @@ Cvar_Toggle_f Toggles a cvar for easy single key binding ============ */ -void Cvar_Toggle_f( void ) +static void Cvar_Toggle_f( void ) { int v; @@ -1114,7 +1114,7 @@ Allows setting and defining of arbitrary cvars from console, even if they weren't declared in C code. ============ */ -void Cvar_Set_f( void ) +static void Cvar_Set_f( void ) { int i, c, l = 0, len; char combined[MAX_CMD_TOKENS]; @@ -1147,7 +1147,7 @@ Cvar_SetGL_f As Cvar_Set, but also flags it as glconfig ============ */ -void Cvar_SetGL_f( void ) +static void Cvar_SetGL_f( void ) { if( Cmd_Argc() != 3 ) { @@ -1163,7 +1163,7 @@ void Cvar_SetGL_f( void ) Cvar_Reset_f ============ */ -void Cvar_Reset_f( void ) +static void Cvar_Reset_f( void ) { if( Cmd_Argc() != 2 ) { @@ -1179,7 +1179,7 @@ void Cvar_Reset_f( void ) Cvar_List_f ============ */ -void Cvar_List_f( void ) +static void Cvar_List_f( void ) { convar_t *var; const char *match = NULL; diff --git a/engine/common/host.c b/engine/common/host.c index 6b10ec10..bedcaa3d 100644 --- a/engine/common/host.c +++ b/engine/common/host.c @@ -65,7 +65,7 @@ static CVAR_DEFINE( host_sleeptime, "sleeptime", "1", FCVAR_ARCHIVE|FCVAR_FILTER static CVAR_DEFINE_AUTO( host_sleeptime_debug, "0", 0, "print sleeps between frames" ); CVAR_DEFINE( con_gamemaps, "con_mapfilter", "1", FCVAR_ARCHIVE, "when true show only maps in game folder" ); -void Sys_PrintUsage( void ) +static void Sys_PrintUsage( void ) { string version_str; const char *usage_str; @@ -366,7 +366,7 @@ Host_ChangeGame_f Change game modification ================= */ -void Host_ChangeGame_f( void ) +static void Host_ChangeGame_f( void ) { int i; @@ -405,7 +405,7 @@ void Host_ChangeGame_f( void ) Host_Exec_f =============== */ -void Host_Exec_f( void ) +static void Host_Exec_f( void ) { string cfgpath; byte *f; @@ -491,7 +491,7 @@ void Host_Exec_f( void ) Host_MemStats_f =============== */ -void Host_MemStats_f( void ) +static void Host_MemStats_f( void ) { switch( Cmd_Argc( )) { @@ -509,7 +509,7 @@ void Host_MemStats_f( void ) } } -void Host_Minimize_f( void ) +static void Host_Minimize_f( void ) { #ifdef XASH_SDL if( host.hWnd ) SDL_MinimizeWindow( host.hWnd ); @@ -548,7 +548,7 @@ qboolean Host_IsLocalClient( void ) Host_RegisterDecal ================= */ -qboolean Host_RegisterDecal( const char *name, int *count ) +static qboolean Host_RegisterDecal( const char *name, int *count ) { char shortname[MAX_QPATH]; int i; @@ -613,7 +613,7 @@ Host_GetCommands Add them exactly as if they had been typed at the console =================== */ -void Host_GetCommands( void ) +static void Host_GetCommands( void ) { char *cmd; @@ -631,7 +631,7 @@ Host_CalcFPS compute actual FPS for various modes =================== */ -double Host_CalcFPS( void ) +static double Host_CalcFPS( void ) { double fps = 0.0; @@ -748,7 +748,7 @@ Host_FilterTime Returns false if the time is too short to run a frame =================== */ -qboolean Host_FilterTime( float time ) +static qboolean Host_FilterTime( float time ) { static double oldtime; double dt; @@ -873,7 +873,7 @@ void GAME_EXPORT Host_Error( const char *error, ... ) Host_AbortCurrentFrame(); } -void Host_Error_f( void ) +static void Host_Error_f( void ) { const char *error = Cmd_Argv( 1 ); @@ -881,7 +881,7 @@ void Host_Error_f( void ) Host_Error( "%s\n", error ); } -void Sys_Error_f( void ) +static void Sys_Error_f( void ) { const char *error = Cmd_Argv( 1 ); @@ -904,7 +904,7 @@ static void Host_Crash_f( void ) Host_Userconfigd_f ================= */ -void Host_Userconfigd_f( void ) +static void Host_Userconfigd_f( void ) { search_t *t; int i; @@ -948,7 +948,7 @@ static void Host_RunTests( int stage ) Host_InitCommon ================= */ -void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bChangeGame ) +static void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bChangeGame ) { char dev_level[4]; int developer = DEFAULT_DEV; @@ -1240,7 +1240,7 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha Key_Init(); } -void Host_FreeCommon( void ) +static void Host_FreeCommon( void ) { Image_Shutdown(); Sound_Shutdown(); diff --git a/engine/common/host_state.c b/engine/common/host_state.c index bea2a364..99d6dd02 100644 --- a/engine/common/host_state.c +++ b/engine/common/host_state.c @@ -121,7 +121,7 @@ void COM_ChangeLevel( char const *pNewLevel, char const *pLandmarkName, qboolean GameState->newGame = false; } -void Host_ShutdownGame( void ) +static void Host_ShutdownGame( void ) { SV_ShutdownGame(); @@ -137,7 +137,7 @@ void Host_ShutdownGame( void ) } } -void Host_RunFrame( float time ) +static void Host_RunFrame( float time ) { // at this time, we don't need to get events from OS on dedicated #if !XASH_DEDICATED diff --git a/engine/common/hpak.c b/engine/common/hpak.c index f7d882d2..313d07ba 100644 --- a/engine/common/hpak.c +++ b/engine/common/hpak.c @@ -34,7 +34,7 @@ static hash_pack_queue_t *gp_hpak_queue = NULL; static hpak_header_t hash_pack_header; static hpak_info_t hash_pack_info; -const char *HPAK_TypeFromIndex( int type ) +static const char *HPAK_TypeFromIndex( int type ) { switch( type ) { @@ -94,7 +94,7 @@ void HPAK_FlushHostQueue( void ) gp_hpak_queue = NULL; } -void HPAK_CreatePak( const char *filename, resource_t *pResource, byte *pData, file_t *fin ) +static void HPAK_CreatePak( const char *filename, resource_t *pResource, byte *pData, file_t *fin ) { int filelocation; string pakname; @@ -872,7 +872,7 @@ void HPAK_RemoveLump( const char *name, resource_t *pResource ) FS_Rename( save_path, read_path ); } -void HPAK_List_f( void ) +static void HPAK_List_f( void ) { int nCurrent; hpak_header_t header; @@ -950,7 +950,7 @@ void HPAK_List_f( void ) FS_Close( f ); } -void HPAK_Extract_f( void ) +static void HPAK_Extract_f( void ) { int nCurrent; hpak_header_t header; @@ -1061,7 +1061,7 @@ void HPAK_Extract_f( void ) FS_Close( f ); } -void HPAK_Remove_f( void ) +static void HPAK_Remove_f( void ) { resource_t resource; @@ -1083,7 +1083,7 @@ void HPAK_Remove_f( void ) } } -void HPAK_Validate_f( void ) +static void HPAK_Validate_f( void ) { if( Cmd_Argc() != 2 ) { diff --git a/engine/common/imagelib/img_dds.c b/engine/common/imagelib/img_dds.c index 1562f847..ad54143c 100644 --- a/engine/common/imagelib/img_dds.c +++ b/engine/common/imagelib/img_dds.c @@ -17,7 +17,7 @@ GNU General Public License for more details. #include "xash3d_mathlib.h" #include "img_dds.h" -qboolean Image_CheckDXT3Alpha( dds_t *hdr, byte *fin ) +static qboolean Image_CheckDXT3Alpha( dds_t *hdr, byte *fin ) { word sAlpha; byte *alpha; @@ -50,7 +50,7 @@ qboolean Image_CheckDXT3Alpha( dds_t *hdr, byte *fin ) return false; } -qboolean Image_CheckDXT5Alpha( dds_t *hdr, byte *fin ) +static qboolean Image_CheckDXT5Alpha( dds_t *hdr, byte *fin ) { uint bits, bitmask; byte *alphamask; @@ -91,7 +91,7 @@ qboolean Image_CheckDXT5Alpha( dds_t *hdr, byte *fin ) return false; } -void Image_DXTGetPixelFormat( dds_t *hdr, dds_header_dxt10_t *headerExt ) +static void Image_DXTGetPixelFormat( dds_t *hdr, dds_header_dxt10_t *headerExt ) { uint bits = hdr->dsPixelFormat.dwRGBBitCount; @@ -215,7 +215,7 @@ void Image_DXTGetPixelFormat( dds_t *hdr, dds_header_dxt10_t *headerExt ) image.num_mips = hdr->dwMipMapCount; // get actual mip count } -size_t Image_DXTCalcMipmapSize( dds_t *hdr ) +static size_t Image_DXTCalcMipmapSize( dds_t *hdr ) { size_t buffsize = 0; int i, width, height; @@ -231,7 +231,7 @@ size_t Image_DXTCalcMipmapSize( dds_t *hdr ) return buffsize; } -uint Image_DXTCalcSize( const char *name, dds_t *hdr, size_t filesize ) +static uint Image_DXTCalcSize( const char *name, dds_t *hdr, size_t filesize ) { size_t buffsize = 0; int w = image.width; @@ -269,7 +269,7 @@ uint Image_DXTCalcSize( const char *name, dds_t *hdr, size_t filesize ) return buffsize; } -void Image_DXTAdjustVolume( dds_t *hdr ) +static void Image_DXTAdjustVolume( dds_t *hdr ) { if( hdr->dwDepth <= 1 ) return; diff --git a/engine/common/imagelib/img_main.c b/engine/common/imagelib/img_main.c index 850d9774..4fe937cb 100644 --- a/engine/common/imagelib/img_main.c +++ b/engine/common/imagelib/img_main.c @@ -597,6 +597,7 @@ void Test_RunImagelib( void ) } #define IMPLEMENT_IMAGELIB_FUZZ_TARGET( export, target ) \ +int export( const uint8_t *Data, size_t Size ); \ int EXPORT export( const uint8_t *Data, size_t Size ) \ { \ rgbdata_t *rgb; \ diff --git a/engine/common/imagelib/img_quant.c b/engine/common/imagelib/img_quant.c index e450e14f..556ee995 100644 --- a/engine/common/imagelib/img_quant.c +++ b/engine/common/imagelib/img_quant.c @@ -65,7 +65,7 @@ static int bias[netsize]; // bias and freq arrays for learning static int freq[netsize]; static int radpower[initrad]; // radpower for precomputation -void initnet( byte *thepic, int len, int sample ) +static void initnet( byte *thepic, int len, int sample ) { register int i, *p; @@ -83,7 +83,7 @@ void initnet( byte *thepic, int len, int sample ) } // Unbias network to give byte values 0..255 and record position i to prepare for sort -void unbiasnet( void ) +static void unbiasnet( void ) { int i, j, temp; @@ -103,7 +103,7 @@ void unbiasnet( void ) } // Insertion sort of network and building of netindex[0..255] (to do after unbias) -void inxbuild( void ) +static void inxbuild( void ) { register int *p, *q; register int i, j, smallpos, smallval; @@ -162,7 +162,7 @@ void inxbuild( void ) // Search for BGR values 0..255 (after net is unbiased) and return colour index -int inxsearch( int r, int g, int b ) +static int inxsearch( int r, int g, int b ) { register int i, j, dist, a, bestd; register int *p; @@ -243,7 +243,7 @@ int inxsearch( int r, int g, int b ) } // Search for biased BGR values -int contest( int r, int g, int b ) +static int contest( int r, int g, int b ) { register int *p, *f, *n; register int i, dist, a, biasdist, betafreq; @@ -298,7 +298,7 @@ int contest( int r, int g, int b ) } // Move neuron i towards biased (b,g,r) by factor alpha -void altersingle( int alpha, int i, int r, int g, int b ) +static void altersingle( int alpha, int i, int r, int g, int b ) { register int *n; @@ -311,7 +311,7 @@ void altersingle( int alpha, int i, int r, int g, int b ) } // Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|] -void alterneigh( int rad, int i, int r, int g, int b ) +static void alterneigh( int rad, int i, int r, int g, int b ) { register int j, k, lo, hi, a; register int *p, *q; @@ -354,7 +354,7 @@ void alterneigh( int rad, int i, int r, int g, int b ) } // Main Learning Loop -void learn( void ) +static void learn( void ) { register byte *p; register int i, j, r, g, b; diff --git a/engine/common/imagelib/img_utils.c b/engine/common/imagelib/img_utils.c index 3fa0a43f..25f059cb 100644 --- a/engine/common/imagelib/img_utils.c +++ b/engine/common/imagelib/img_utils.c @@ -281,7 +281,7 @@ int Image_ComparePalette( const byte *pal ) return PAL_CUSTOM; } -void Image_SetPalette( const byte *pal, uint *d_table ) +static void Image_SetPalette( const byte *pal, uint *d_table ) { byte rgba[4]; uint uirgba; // TODO: palette looks byte-swapped on big-endian @@ -726,7 +726,7 @@ static void Image_Resample24LerpLine( const byte *in, byte *out, int inwidth, in } } -void Image_Resample32Lerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) +static void Image_Resample32Lerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) { const byte *inrow; int i, j, r, yi, oldy = 0, f, fstep, lerp, endy = (inheight - 1); @@ -834,7 +834,7 @@ void Image_Resample32Lerp( const void *indata, int inwidth, int inheight, void * Mem_Free( resamplerow1 ); } -void Image_Resample32Nolerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) +static void Image_Resample32Nolerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) { int i, j; uint frac, fracstep; @@ -873,7 +873,7 @@ void Image_Resample32Nolerp( const void *indata, int inwidth, int inheight, void } } -void Image_Resample24Lerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) +static void Image_Resample24Lerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) { const byte *inrow; int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight - 1); @@ -974,7 +974,7 @@ void Image_Resample24Lerp( const void *indata, int inwidth, int inheight, void * Mem_Free( resamplerow1 ); } -void Image_Resample24Nolerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) +static void Image_Resample24Nolerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) { uint frac, fracstep; int i, j, f, inwidth3 = inwidth * 3; @@ -1040,7 +1040,7 @@ void Image_Resample24Nolerp( const void *indata, int inwidth, int inheight, void } } -void Image_Resample8Nolerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) +static void Image_Resample8Nolerp( const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight ) { int i, j; byte *in, *inrow; @@ -1179,7 +1179,7 @@ byte *Image_FlipInternal( const byte *in, word *srcwidth, word *srcheight, int t return image.tempbuffer; } -byte *Image_CreateLumaInternal( byte *fin, int width, int height, int type, int flags ) +static byte *Image_CreateLumaInternal( byte *fin, int width, int height, int type, int flags ) { byte *out; int i; @@ -1235,7 +1235,7 @@ Image_Decompress force to unpack any image to 32-bit buffer ============= */ -qboolean Image_Decompress( const byte *data ) +static qboolean Image_Decompress( const byte *data ) { byte *fin, *fout; int i, size; @@ -1303,7 +1303,7 @@ qboolean Image_Decompress( const byte *data ) return true; } -rgbdata_t *Image_DecompressInternal( rgbdata_t *pic ) +static rgbdata_t *Image_DecompressInternal( rgbdata_t *pic ) { // quick case to reject unneeded conversions if( pic->type == PF_RGBA_32 ) @@ -1326,7 +1326,7 @@ rgbdata_t *Image_DecompressInternal( rgbdata_t *pic ) return pic; } -rgbdata_t *Image_LightGamma( rgbdata_t *pic ) +static rgbdata_t *Image_LightGamma( rgbdata_t *pic ) { byte *in = (byte *)pic->buffer; int i; @@ -1344,7 +1344,7 @@ rgbdata_t *Image_LightGamma( rgbdata_t *pic ) return pic; } -qboolean Image_RemapInternal( rgbdata_t *pic, int topColor, int bottomColor ) +static qboolean Image_RemapInternal( rgbdata_t *pic, int topColor, int bottomColor ) { if( !pic->palette ) return false; diff --git a/engine/common/infostring.c b/engine/common/infostring.c index 77c8aaac..25acb6a0 100644 --- a/engine/common/infostring.c +++ b/engine/common/infostring.c @@ -333,7 +333,7 @@ void Info_RemovePrefixedKeys( char *start, char prefix ) } } -qboolean Info_IsKeyImportant( const char *key ) +static qboolean Info_IsKeyImportant( const char *key ) { if( key[0] == '*' ) return true; @@ -358,7 +358,7 @@ qboolean Info_IsKeyImportant( const char *key ) return false; } -char *Info_FindLargestKey( char *s ) +static char *Info_FindLargestKey( char *s ) { char key[MAX_KV_SIZE]; char value[MAX_KV_SIZE]; diff --git a/engine/common/mod_bmodel.c b/engine/common/mod_bmodel.c index 2adf38ae..229a972a 100644 --- a/engine/common/mod_bmodel.c +++ b/engine/common/mod_bmodel.c @@ -583,7 +583,7 @@ void Mod_PrintWorldStats_f( void ) Mod_DecompressPVS =================== */ -byte *Mod_DecompressPVS( const byte *in, int visbytes ) +static byte *Mod_DecompressPVS( const byte *in, int visbytes ) { byte *out; int c; diff --git a/engine/common/mod_sprite.c b/engine/common/mod_sprite.c index f76774ae..8d70e0a5 100644 --- a/engine/common/mod_sprite.c +++ b/engine/common/mod_sprite.c @@ -20,6 +20,7 @@ GNU General Public License for more details. #if !XASH_DEDICATED #include "ref_common.h" #endif // XASH_DEDICATED +#include "mod_local.h" /* diff --git a/engine/common/net_buffer.c b/engine/common/net_buffer.c index c219e8c7..8906f4c8 100644 --- a/engine/common/net_buffer.c +++ b/engine/common/net_buffer.c @@ -188,7 +188,7 @@ int MSG_SeekToBit( sizebuf_t *sb, int bitPos, int whence ) return 0; } -void MSG_SeekToByte( sizebuf_t *sb, int bytePos ) +static void MSG_SeekToByte( sizebuf_t *sb, int bytePos ) { sb->iCurBit = bytePos << 3; } diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c index c1974ec8..0d4b0a6c 100644 --- a/engine/common/net_chan.c +++ b/engine/common/net_chan.c @@ -205,7 +205,7 @@ NetSplit_SendLong Send parts that are less or equal maxpacket ====================== */ -void NetSplit_SendLong( netsrc_t sock, size_t length, void *data, netadr_t to, unsigned int maxpacket, unsigned int id) +static void NetSplit_SendLong( netsrc_t sock, size_t length, void *data, netadr_t to, unsigned int maxpacket, unsigned int id) { netsplit_packet_t packet = {0}; unsigned int part = maxpacket - NETSPLIT_HEADER_SIZE; @@ -367,7 +367,7 @@ Netchan_UnlinkFragment ============================== */ -void Netchan_UnlinkFragment( fragbuf_t *buf, fragbuf_t **list ) +static void Netchan_UnlinkFragment( fragbuf_t *buf, fragbuf_t **list ) { fragbuf_t *search; @@ -405,7 +405,7 @@ Netchan_ClearFragbufs ============================== */ -void Netchan_ClearFragbufs( fragbuf_t **ppbuf ) +static void Netchan_ClearFragbufs( fragbuf_t **ppbuf ) { fragbuf_t *buf, *n; @@ -431,7 +431,7 @@ Netchan_ClearFragments ============================== */ -void Netchan_ClearFragments( netchan_t *chan ) +static void Netchan_ClearFragments( netchan_t *chan ) { fragbufwaiting_t *wait, *next; int i; @@ -539,7 +539,7 @@ Netchan_AllocFragbuf ============================== */ -fragbuf_t *Netchan_AllocFragbuf( int fragment_size ) +static fragbuf_t *Netchan_AllocFragbuf( int fragment_size ) { fragbuf_t *buf; @@ -556,7 +556,7 @@ Netchan_AddFragbufToTail ============================== */ -void Netchan_AddFragbufToTail( fragbufwaiting_t *wait, fragbuf_t *buf ) +static void Netchan_AddFragbufToTail( fragbufwaiting_t *wait, fragbuf_t *buf ) { fragbuf_t *p; @@ -579,7 +579,7 @@ Netchan_UpdateFlow ============================== */ -void Netchan_UpdateFlow( netchan_t *chan ) +static void Netchan_UpdateFlow( netchan_t *chan ) { float faccumulatedtime = 0.0; int i, bytes = 0; @@ -791,7 +791,7 @@ Netchan_FindBufferById ============================== */ -fragbuf_t *Netchan_FindBufferById( fragbuf_t **pplist, int id, qboolean allocate ) +static fragbuf_t *Netchan_FindBufferById( fragbuf_t **pplist, int id, qboolean allocate ) { fragbuf_t *list = *pplist; fragbuf_t *pnewbuf; @@ -821,7 +821,7 @@ Netchan_CheckForCompletion ============================== */ -void Netchan_CheckForCompletion( netchan_t *chan, int stream, int intotalbuffers ) +static void Netchan_CheckForCompletion( netchan_t *chan, int stream, int intotalbuffers ) { int c, id; int size; @@ -1287,7 +1287,7 @@ qboolean Netchan_CopyFileFragments( netchan_t *chan, sizebuf_t *msg ) return true; } -qboolean Netchan_Validate( netchan_t *chan, sizebuf_t *sb, qboolean *frag_message, uint *fragid, int *frag_offset, int *frag_length ) +static qboolean Netchan_Validate( netchan_t *chan, sizebuf_t *sb, qboolean *frag_message, uint *fragid, int *frag_offset, int *frag_length ) { int i, buffer, offset; int count, length; diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c index de05146a..9090ff57 100644 --- a/engine/common/net_ws.c +++ b/engine/common/net_ws.c @@ -317,7 +317,7 @@ static void NET_SockadrToNetadr( const struct sockaddr_storage *s, netadr_t *a ) NET_GetHostByName ============ */ -qboolean NET_GetHostByName( const char *hostname, int family, struct sockaddr_storage *addr ) +static qboolean NET_GetHostByName( const char *hostname, int family, struct sockaddr_storage *addr ) { #if defined HAVE_GETADDRINFO struct addrinfo *ai = NULL, *cur; @@ -372,7 +372,7 @@ static void NET_ResolveThread( void ); #define detach_thread( x ) pthread_detach(x) #define mutex_t pthread_mutex_t #define thread_t pthread_t -void *NET_ThreadStart( void *unused ) +static void *NET_ThreadStart( void *unused ) { NET_ResolveThread(); return NULL; @@ -1018,7 +1018,7 @@ idnewt 192.246.40.70 ============= */ -qboolean NET_StringToAdrEx( const char *string, netadr_t *adr, int family ) +static qboolean NET_StringToAdrEx( const char *string, netadr_t *adr, int family ) { struct sockaddr_storage s; @@ -1339,7 +1339,7 @@ NET_GetLong receive long packet from network ================== */ -qboolean NET_GetLong( byte *pData, int size, size_t *outSize, int splitsize ) +static qboolean NET_GetLong( byte *pData, int size, size_t *outSize, int splitsize ) { int i, sequence_number, offset; SPLITPACKET *pHeader = (SPLITPACKET *)pData; @@ -1534,7 +1534,7 @@ NET_SendLong Fragment long packets, send short directly ================== */ -int NET_SendLong( netsrc_t sock, int net_socket, const char *buf, size_t len, int flags, const struct sockaddr_storage *to, size_t tolen, size_t splitsize ) +static int NET_SendLong( netsrc_t sock, int net_socket, const char *buf, size_t len, int flags, const struct sockaddr_storage *to, size_t tolen, size_t splitsize ) { #ifdef NET_USE_FRAGMENTS // do we need to break this packet up? @@ -1864,7 +1864,7 @@ NET_GetLocalAddress Returns the servers' ip address as a string. ================ */ -void NET_GetLocalAddress( void ) +static void NET_GetLocalAddress( void ) { char hostname[512]; char buff[512]; diff --git a/engine/common/pm_surface.c b/engine/common/pm_surface.c index d1124a3d..c9d7701f 100644 --- a/engine/common/pm_surface.c +++ b/engine/common/pm_surface.c @@ -48,7 +48,7 @@ SampleMiptex fence texture testing ============= */ -int PM_SampleMiptex( const msurface_t *surf, const vec3_t point ) +static int PM_SampleMiptex( const msurface_t *surf, const vec3_t point ) { mextrasurf_t *info = surf->info; mfacebevel_t *fb = info->bevel; @@ -221,7 +221,7 @@ PM_TestLine_r optimized trace for light gathering ================== */ -int PM_TestLine_r( model_t *mod, mnode_t *node, vec_t p1f, vec_t p2f, const vec3_t start, const vec3_t stop, linetrace_t *trace ) +static int PM_TestLine_r( model_t *mod, mnode_t *node, vec_t p1f, vec_t p2f, const vec3_t start, const vec3_t stop, linetrace_t *trace ) { float front, back; float frac, midf; diff --git a/engine/common/pm_trace.c b/engine/common/pm_trace.c index 45a935b4..e90aff2f 100644 --- a/engine/common/pm_trace.c +++ b/engine/common/pm_trace.c @@ -105,7 +105,7 @@ To keep everything totally uniform, bounding boxes are turned into small BSP trees instead of being compared directly. =================== */ -hull_t *PM_HullForBox( const vec3_t mins, const vec3_t maxs ) +static hull_t *PM_HullForBox( const vec3_t mins, const vec3_t maxs ) { pm_boxplanes[0].dist = maxs[0]; pm_boxplanes[1].dist = mins[0]; @@ -199,7 +199,7 @@ PM_HullForStudio generate multiple hulls as hitboxes ================== */ -hull_t *PM_HullForStudio( physent_t *pe, playermove_t *pmove, int *numhitboxes ) +static hull_t *PM_HullForStudio( physent_t *pe, playermove_t *pmove, int *numhitboxes ) { vec3_t size; diff --git a/engine/common/soundlib/snd_main.c b/engine/common/soundlib/snd_main.c index dee4c200..15c2ad3c 100644 --- a/engine/common/soundlib/snd_main.c +++ b/engine/common/soundlib/snd_main.c @@ -18,7 +18,7 @@ GNU General Public License for more details. // global sound variables sndlib_t sound; -void Sound_Reset( void ) +static void Sound_Reset( void ) { // reset global variables sound.width = sound.rate = 0; @@ -30,7 +30,7 @@ void Sound_Reset( void ) sound.size = 0; } -wavdata_t *SoundPack( void ) +static wavdata_t *SoundPack( void ) { wavdata_t *pack = Mem_Calloc( host.soundpool, sizeof( wavdata_t )); @@ -294,6 +294,7 @@ void FS_FreeStream( stream_t *stream ) #if XASH_ENGINE_TESTS #define IMPLEMENT_SOUNDLIB_FUZZ_TARGET( export, target ) \ +int EXPORT export( const uint8_t *Data, size_t Size ); \ int EXPORT export( const uint8_t *Data, size_t Size ) \ { \ wavdata_t *wav; \ diff --git a/engine/common/soundlib/snd_mp3.c b/engine/common/soundlib/snd_mp3.c index 062a8bdb..685d7993 100644 --- a/engine/common/soundlib/snd_mp3.c +++ b/engine/common/soundlib/snd_mp3.c @@ -186,6 +186,7 @@ static qboolean Sound_ParseID3Tag( const byte *buffer, fs_offset_t filesize ) } #if XASH_ENGINE_TESTS +int EXPORT Fuzz_Sound_ParseID3Tag( const uint8_t *Data, size_t Size ); int EXPORT Fuzz_Sound_ParseID3Tag( const uint8_t *Data, size_t Size ) { memset( &sound, 0, sizeof( sound )); @@ -294,7 +295,7 @@ qboolean Sound_LoadMPG( const char *name, const byte *buffer, fs_offset_t filesi FS_SeekEx ================= */ -fs_offset_t FS_SeekEx( file_t *file, fs_offset_t offset, int whence ) +static fs_offset_t FS_SeekEx( file_t *file, fs_offset_t offset, int whence ) { return FS_Seek( file, offset, whence ) == -1 ? -1 : FS_Tell( file ); } diff --git a/engine/common/soundlib/snd_utils.c b/engine/common/soundlib/snd_utils.c index 3acdd8ee..ee6697e0 100644 --- a/engine/common/soundlib/snd_utils.c +++ b/engine/common/soundlib/snd_utils.c @@ -83,7 +83,7 @@ void Sound_Shutdown( void ) Mem_FreePool( &host.soundpool ); } -byte *Sound_Copy( size_t size ) +static byte *Sound_Copy( size_t size ) { byte *out; @@ -139,7 +139,7 @@ Sound_ResampleInternal We need convert sound to signed even if nothing to resample ================ */ -qboolean Sound_ResampleInternal( wavdata_t *sc, int inrate, int inwidth, int outrate, int outwidth ) +static qboolean Sound_ResampleInternal( wavdata_t *sc, int inrate, int inwidth, int outrate, int outwidth ) { double stepscale, j; int outcount; diff --git a/engine/common/soundlib/snd_wav.c b/engine/common/soundlib/snd_wav.c index 3f6ac5ec..0f3ad399 100644 --- a/engine/common/soundlib/snd_wav.c +++ b/engine/common/soundlib/snd_wav.c @@ -117,7 +117,7 @@ static void FindChunk( const char *filename, const char *name ) StreamFindNextChunk ============ */ -qboolean StreamFindNextChunk( file_t *file, const char *name, int *last_chunk ) +static qboolean StreamFindNextChunk( file_t *file, const char *name, int *last_chunk ) { char chunkName[4]; int iff_chunk_len; diff --git a/engine/common/system.c b/engine/common/system.c index d977e8dd..c6c1447a 100644 --- a/engine/common/system.c +++ b/engine/common/system.c @@ -362,7 +362,7 @@ Sys_WaitForQuit wait for 'Esc' key will be hit ================ */ -void Sys_WaitForQuit( void ) +static void Sys_WaitForQuit( void ) { #if XASH_WIN32 MSG msg; diff --git a/engine/platform/sdl/s_sdl.c b/engine/platform/sdl/s_sdl.c index 0cde9bc5..f12b67b8 100644 --- a/engine/platform/sdl/s_sdl.c +++ b/engine/platform/sdl/s_sdl.c @@ -49,7 +49,7 @@ static SDL_AudioDeviceID in_dev = 0; static SDL_AudioFormat sdl_format; static char sdl_backend_name[32]; -void SDL_SoundCallback( void *userdata, Uint8 *stream, int len ) +static void SDL_SoundCallback( void *userdata, Uint8 *stream, int len ) { const int size = dma.samples << 1; int pos; @@ -244,7 +244,7 @@ void SNDDMA_Activate( qboolean active ) SDL_SoundInputCallback =========== */ -void SDL_SoundInputCallback( void *userdata, Uint8 *stream, int len ) +static void SDL_SoundInputCallback( void *userdata, Uint8 *stream, int len ) { int size = Q_min( len, sizeof( voice.input_buffer ) - voice.input_buffer_pos ); diff --git a/engine/server/sv_client.c b/engine/server/sv_client.c index b947362e..3a8972c0 100644 --- a/engine/server/sv_client.c +++ b/engine/server/sv_client.c @@ -118,7 +118,7 @@ void SV_GetChallenge( netadr_t from ) Netchan_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "challenge %i", svs.challenges[i].challenge ); } -int SV_GetFragmentSize( void *pcl, fragsize_t mode ) +static int SV_GetFragmentSize( void *pcl, fragsize_t mode ) { sv_client_t *cl = (sv_client_t*)pcl; int cl_frag_size; @@ -191,7 +191,7 @@ for some reasons file can't be downloaded tell the client about this problem ================ */ -void SV_FailDownload( sv_client_t *cl, const char *filename ) +static void SV_FailDownload( sv_client_t *cl, const char *filename ) { if( !COM_CheckString( filename )) return; @@ -207,7 +207,7 @@ SV_CheckChallenge Make sure connecting client is not spoofing ================ */ -int SV_CheckChallenge( netadr_t from, int challenge ) +static int SV_CheckChallenge( netadr_t from, int challenge ) { int i; @@ -247,7 +247,7 @@ SV_CheckIPRestrictions Determine if client is outside appropriate address range ================ */ -int SV_CheckIPRestrictions( netadr_t from ) +static int SV_CheckIPRestrictions( netadr_t from ) { if( sv_lan.value ) { @@ -265,7 +265,7 @@ Get slot # and set client_t pointer for player, if possible We don't do this search on a "reconnect, we just reuse the slot ================ */ -int SV_FindEmptySlot( netadr_t from, int *pslot, sv_client_t **ppClient ) +static int SV_FindEmptySlot( netadr_t from, int *pslot, sv_client_t **ppClient ) { sv_client_t *cl; int i; @@ -291,7 +291,7 @@ SV_ConnectClient A connection request that did not come from the master ================== */ -void SV_ConnectClient( netadr_t from ) +static void SV_ConnectClient( netadr_t from ) { char userinfo[MAX_INFO_STRING]; char protinfo[MAX_INFO_STRING]; @@ -831,7 +831,7 @@ SV_TestBandWidth ================ */ -void SV_TestBandWidth( netadr_t from ) +static void SV_TestBandWidth( netadr_t from ) { const int version = Q_atoi( Cmd_Argv( 1 )); const int packetsize = Q_atoi( Cmd_Argv( 2 )); @@ -876,7 +876,7 @@ SV_Ack ================ */ -void SV_Ack( netadr_t from ) +static void SV_Ack( netadr_t from ) { Con_Printf( "ping %s\n", NET_AdrToString( from )); } @@ -889,7 +889,7 @@ Responds with short info for broadcast scans The second parameter should be the current protocol version number. ================ */ -void SV_Info( netadr_t from, int protocolVersion ) +static void SV_Info( netadr_t from, int protocolVersion ) { char s[512]; @@ -947,7 +947,7 @@ SV_BuildNetAnswer Responds with long info for local and broadcast requests ================ */ -void SV_BuildNetAnswer( netadr_t from ) +static void SV_BuildNetAnswer( netadr_t from ) { char string[MAX_INFO_STRING]; int version, context, type; @@ -1043,7 +1043,7 @@ SV_Ping Just responds with an acknowledgement ================ */ -void SV_Ping( netadr_t from ) +static void SV_Ping( netadr_t from ) { Netchan_OutOfBandPrint( NS_SERVER, from, "ack" ); } @@ -1053,7 +1053,7 @@ void SV_Ping( netadr_t from ) Rcon_Validate ================ */ -qboolean Rcon_Validate( void ) +static qboolean Rcon_Validate( void ) { if( !COM_CheckString( rcon_password.string )) return false; @@ -1156,7 +1156,7 @@ SV_EstablishTimeBase Finangles latency and the like. =================== */ -void SV_EstablishTimeBase( sv_client_t *cl, usercmd_t *cmds, int dropped, int numbackup, int numcmds ) +static void SV_EstablishTimeBase( sv_client_t *cl, usercmd_t *cmds, int dropped, int numbackup, int numcmds ) { double runcmd_time = 0.0; int i, cmdnum = dropped; @@ -1190,7 +1190,7 @@ SV_CalcClientTime compute latency for client =================== */ -float SV_CalcClientTime( sv_client_t *cl ) +static float SV_CalcClientTime( sv_client_t *cl ) { float minping, maxping; float ping = 0.0f; @@ -1389,7 +1389,7 @@ Called when a player connects to a server or respawns in a deathmatch. ============ */ -void SV_PutClientInServer( sv_client_t *cl ) +static void SV_PutClientInServer( sv_client_t *cl ) { static byte msg_buf[MAX_INIT_MSG + 0x200]; // MAX_INIT_MSG + some space edict_t *ent = cl->edict; @@ -1522,7 +1522,7 @@ SV_UpdateClientView Resend the client viewentity (used for demos) ============ */ -void SV_UpdateClientView( sv_client_t *cl ) +static void SV_UpdateClientView( sv_client_t *cl ) { int viewEnt; @@ -3306,7 +3306,7 @@ SV_ParseResourceList Parse resource list =================== */ -void SV_ParseResourceList( sv_client_t *cl, sizebuf_t *msg ) +static void SV_ParseResourceList( sv_client_t *cl, sizebuf_t *msg ) { int totalsize; resource_t *resource; @@ -3395,7 +3395,7 @@ SV_ParseCvarValue Parse a requested value from client cvar =================== */ -void SV_ParseCvarValue( sv_client_t *cl, sizebuf_t *msg ) +static void SV_ParseCvarValue( sv_client_t *cl, sizebuf_t *msg ) { const char *value = MSG_ReadString( msg ); @@ -3411,7 +3411,7 @@ SV_ParseCvarValue2 Parse a requested value from client cvar =================== */ -void SV_ParseCvarValue2( sv_client_t *cl, sizebuf_t *msg ) +static void SV_ParseCvarValue2( sv_client_t *cl, sizebuf_t *msg ) { string name, value; int requestID = MSG_ReadLong( msg ); @@ -3429,7 +3429,7 @@ void SV_ParseCvarValue2( sv_client_t *cl, sizebuf_t *msg ) SV_ParseVoiceData =================== */ -void SV_ParseVoiceData( sv_client_t *cl, sizebuf_t *msg ) +static void SV_ParseVoiceData( sv_client_t *cl, sizebuf_t *msg ) { char received[4096]; sv_client_t *cur; diff --git a/engine/server/sv_cmds.c b/engine/server/sv_cmds.c index 6ecbbef1..c7851b78 100644 --- a/engine/server/sv_cmds.c +++ b/engine/server/sv_cmds.c @@ -169,7 +169,7 @@ SV_ValidateMap check map for typically errors ================== */ -qboolean SV_ValidateMap( const char *pMapName, qboolean check_spawn ) +static qboolean SV_ValidateMap( const char *pMapName, qboolean check_spawn ) { char *spawn_entity; int flags; @@ -210,7 +210,7 @@ Goes directly to a given map without any savegame archiving. For development work ================== */ -void SV_Map_f( void ) +static void SV_Map_f( void ) { char mapname[MAX_QPATH]; @@ -240,7 +240,7 @@ Lists maps according to given substring. TODO: Make it more convenient. (Timestamp check, temporary file, ...) ================== */ -void SV_Maps_f( void ) +static void SV_Maps_f( void ) { const char *separator = "-------------------"; const char *argStr = Cmd_Argv( 1 ); // Substr @@ -275,7 +275,7 @@ SV_MapBackground_f Set background map (enable physics in menu) ================== */ -void SV_MapBackground_f( void ) +static void SV_MapBackground_f( void ) { char mapname[MAX_QPATH]; @@ -315,7 +315,7 @@ Change map for next in alpha-bethical ordering For development work ================== */ -void SV_NextMap_f( void ) +static void SV_NextMap_f( void ) { char nextmap[MAX_QPATH]; int i, next; @@ -366,7 +366,7 @@ SV_NewGame_f ============== */ -void SV_NewGame_f( void ) +static void SV_NewGame_f( void ) { if( Cmd_Argc() != 1 ) { @@ -383,7 +383,7 @@ SV_HazardCourse_f ============== */ -void SV_HazardCourse_f( void ) +static void SV_HazardCourse_f( void ) { if( Cmd_Argc() != 1 ) { @@ -406,7 +406,7 @@ SV_Load_f ============== */ -void SV_Load_f( void ) +static void SV_Load_f( void ) { char path[MAX_QPATH]; @@ -426,7 +426,7 @@ SV_QuickLoad_f ============== */ -void SV_QuickLoad_f( void ) +static void SV_QuickLoad_f( void ) { Cbuf_AddText( "echo Quick Loading...; wait; load quick" ); } @@ -437,7 +437,7 @@ SV_Save_f ============== */ -void SV_Save_f( void ) +static void SV_Save_f( void ) { qboolean ret = false; @@ -464,7 +464,7 @@ SV_QuickSave_f ============== */ -void SV_QuickSave_f( void ) +static void SV_QuickSave_f( void ) { Cbuf_AddText( "echo Quick Saving...; wait; save quick" ); } @@ -475,7 +475,7 @@ SV_DeleteSave_f ============== */ -void SV_DeleteSave_f( void ) +static void SV_DeleteSave_f( void ) { if( Cmd_Argc() != 2 ) { @@ -494,7 +494,7 @@ SV_AutoSave_f ============== */ -void SV_AutoSave_f( void ) +static void SV_AutoSave_f( void ) { if( Cmd_Argc() != 1 ) { @@ -513,7 +513,7 @@ SV_Restart_f restarts current level ================== */ -void SV_Restart_f( void ) +static void SV_Restart_f( void ) { // because restart can be multiple issued if( sv.state != ss_active ) @@ -528,7 +528,7 @@ SV_Reload_f continue from latest savedgame ================== */ -void SV_Reload_f( void ) +static void SV_Reload_f( void ) { // because reload can be multiple issued if( GameState->nextstate != STATE_RUNFRAME ) @@ -545,7 +545,7 @@ SV_ChangeLevel_f classic change level ================== */ -void SV_ChangeLevel_f( void ) +static void SV_ChangeLevel_f( void ) { if( Cmd_Argc() != 2 ) { @@ -563,7 +563,7 @@ SV_ChangeLevel2_f smooth change level ================== */ -void SV_ChangeLevel2_f( void ) +static void SV_ChangeLevel2_f( void ) { if( Cmd_Argc() != 3 ) { @@ -581,7 +581,7 @@ SV_Kick_f Kick a user off of the server ================== */ -void SV_Kick_f( void ) +static void SV_Kick_f( void ) { sv_client_t *cl; const char *param; @@ -612,7 +612,7 @@ void SV_Kick_f( void ) SV_EntPatch_f ================== */ -void SV_EntPatch_f( void ) +static void SV_EntPatch_f( void ) { const char *mapname; @@ -687,7 +687,7 @@ void SV_Status_f( void ) SV_ConSay_f ================== */ -void SV_ConSay_f( void ) +static void SV_ConSay_f( void ) { const char *p; char text[MAX_SYSPATH]; @@ -730,7 +730,7 @@ SV_ServerInfo_f Examine or change the serverinfo string =========== */ -void SV_ServerInfo_f( void ) +static void SV_ServerInfo_f( void ) { convar_t *var; @@ -774,7 +774,7 @@ SV_LocalInfo_f Examine or change the localinfo string =========== */ -void SV_LocalInfo_f( void ) +static void SV_LocalInfo_f( void ) { if( Cmd_Argc() == 1 ) { @@ -806,7 +806,7 @@ SV_ClientInfo_f Examine all a users info strings =========== */ -void SV_ClientInfo_f( void ) +static void SV_ClientInfo_f( void ) { sv_client_t *cl; @@ -832,7 +832,7 @@ SV_ClientUserAgent_f Examine useragent strings =========== */ -void SV_ClientUserAgent_f( void ) +static void SV_ClientUserAgent_f( void ) { sv_client_t *cl; @@ -857,7 +857,7 @@ SV_KillServer_f Kick everyone off, possibly in preparation for a new game =============== */ -void SV_KillServer_f( void ) +static void SV_KillServer_f( void ) { Host_ShutdownServer(); } @@ -869,7 +869,7 @@ SV_PlayersOnly_f disable plhysics but players =============== */ -void SV_PlayersOnly_f( void ) +static void SV_PlayersOnly_f( void ) { if( !Cvar_VariableInteger( "sv_cheats" )) return; @@ -884,7 +884,7 @@ SV_EdictUsage_f =============== */ -void SV_EdictUsage_f( void ) +static void SV_EdictUsage_f( void ) { int active; @@ -906,7 +906,7 @@ SV_EntityInfo_f =============== */ -void SV_EntityInfo_f( void ) +static void SV_EntityInfo_f( void ) { edict_t *ent; int i; @@ -950,7 +950,7 @@ Rcon_Redirect_f Force redirect N lines of console output to client ================ */ -void Rcon_Redirect_f( void ) +static void Rcon_Redirect_f( void ) { int lines = 2000; diff --git a/engine/server/sv_custom.c b/engine/server/sv_custom.c index f18ad6a3..5e09e832 100644 --- a/engine/server/sv_custom.c +++ b/engine/server/sv_custom.c @@ -16,7 +16,7 @@ GNU General Public License for more details. #include "common.h" #include "server.h" -void SV_CreateCustomizationList( sv_client_t *cl ) +static void SV_CreateCustomizationList( sv_client_t *cl ) { resource_t *pResource; customization_t *pList, *pCust; @@ -61,7 +61,7 @@ void SV_CreateCustomizationList( sv_client_t *cl ) } } -qboolean SV_FileInConsistencyList( const char *filename, consistency_t **ppout ) +static qboolean SV_FileInConsistencyList( const char *filename, consistency_t **ppout ) { int i; @@ -246,7 +246,7 @@ void SV_TransferConsistencyInfo( void ) sv.num_consistency = total; } -void SV_SendConsistencyList( sv_client_t *cl, sizebuf_t *msg ) +static void SV_SendConsistencyList( sv_client_t *cl, sizebuf_t *msg ) { int i, lastcheck; int delta; @@ -288,7 +288,7 @@ void SV_SendConsistencyList( sv_client_t *cl, sizebuf_t *msg ) MSG_WriteOneBit( msg, 0 ); } -qboolean SV_CheckFile( sizebuf_t *msg, const char *filename ) +static qboolean SV_CheckFile( sizebuf_t *msg, const char *filename ) { resource_t p; @@ -337,7 +337,7 @@ void SV_AddToResourceList( resource_t *pResource, resource_t *pList ) pList->pPrev = pResource; } -void SV_SendCustomization( sv_client_t *cl, int playernum, resource_t *pResource ) +static void SV_SendCustomization( sv_client_t *cl, int playernum, resource_t *pResource ) { MSG_BeginServerCmd( &cl->netchan.message, svc_customization ); MSG_WriteByte( &cl->netchan.message, playernum ); // playernum @@ -410,7 +410,7 @@ int SV_EstimateNeededResources( sv_client_t *cl ) return size; } -void SV_Customization( sv_client_t *pClient, resource_t *pResource, qboolean bSkipPlayer ) +static void SV_Customization( sv_client_t *pClient, resource_t *pResource, qboolean bSkipPlayer ) { int i, nPlayerNumber = -1; sv_client_t *cl; @@ -435,7 +435,7 @@ void SV_Customization( sv_client_t *pClient, resource_t *pResource, qboolean bSk } } -void SV_PropagateCustomizations( sv_client_t *pHost ) +static void SV_PropagateCustomizations( sv_client_t *pHost ) { customization_t *pCust; resource_t *pResource; @@ -459,7 +459,7 @@ void SV_PropagateCustomizations( sv_client_t *pHost ) } } -void SV_RegisterResources( sv_client_t *pHost ) +static void SV_RegisterResources( sv_client_t *pHost ) { resource_t *pResource; @@ -470,7 +470,7 @@ void SV_RegisterResources( sv_client_t *pHost ) } } -qboolean SV_UploadComplete( sv_client_t *cl ) +static qboolean SV_UploadComplete( sv_client_t *cl ) { if( &cl->resourcesneeded != cl->resourcesneeded.pNext ) return false; diff --git a/engine/server/sv_filter.c b/engine/server/sv_filter.c index 289e494d..5745498e 100644 --- a/engine/server/sv_filter.c +++ b/engine/server/sv_filter.c @@ -600,7 +600,7 @@ void SV_ShutdownFilter( void ) #include "tests.h" -void Test_StringToFilterAdr( void ) +static void Test_StringToFilterAdr( void ) { ipfilter_t f1; int i; @@ -669,7 +669,7 @@ void Test_StringToFilterAdr( void ) } } -void Test_IPFilterIncludesIPFilter( void ) +static void Test_IPFilterIncludesIPFilter( void ) { qboolean ret; const char *adrs[] = diff --git a/engine/server/sv_frame.c b/engine/server/sv_frame.c index 3cee17b9..0baeada7 100644 --- a/engine/server/sv_frame.c +++ b/engine/server/sv_frame.c @@ -180,7 +180,7 @@ SV_FindBestBaseline trying to deltas with previous entities ============= */ -int SV_FindBestBaseline( sv_client_t *cl, int index, entity_state_t **baseline, entity_state_t *to, client_frame_t *frame, qboolean player ) +static int SV_FindBestBaseline( sv_client_t *cl, int index, entity_state_t **baseline, entity_state_t *to, client_frame_t *frame, qboolean player ) { int bestBitCount; int i, bitCount; @@ -515,7 +515,7 @@ SV_EmitPings ============= */ -void SV_EmitPings( sizebuf_t *msg ) +static void SV_EmitPings( sizebuf_t *msg ) { sv_client_t *cl; int packet_loss; @@ -547,7 +547,7 @@ SV_WriteClientdataToMessage ================== */ -void SV_WriteClientdataToMessage( sv_client_t *cl, sizebuf_t *msg ) +static void SV_WriteClientdataToMessage( sv_client_t *cl, sizebuf_t *msg ) { clientdata_t nullcd; clientdata_t *from_cd, *to_cd; @@ -634,7 +634,7 @@ SV_WriteEntitiesToClient ================== */ -void SV_WriteEntitiesToClient( sv_client_t *cl, sizebuf_t *msg ) +static void SV_WriteEntitiesToClient( sv_client_t *cl, sizebuf_t *msg ) { client_frame_t *frame; entity_state_t *state; @@ -706,7 +706,7 @@ FRAME UPDATES SV_SendClientDatagram ======================= */ -void SV_SendClientDatagram( sv_client_t *cl ) +static void SV_SendClientDatagram( sv_client_t *cl ) { byte msg_buf[MAX_DATAGRAM]; sizebuf_t msg; @@ -752,7 +752,7 @@ void SV_SendClientDatagram( sv_client_t *cl ) SV_UpdateUserInfo ======================= */ -void SV_UpdateUserInfo( sv_client_t *cl ) +static void SV_UpdateUserInfo( sv_client_t *cl ) { SV_FullClientUpdate( cl, &sv.reliable_datagram ); ClearBits( cl->flags, FCL_RESEND_USERINFO ); @@ -764,7 +764,7 @@ void SV_UpdateUserInfo( sv_client_t *cl ) SV_UpdateToReliableMessages ======================= */ -void SV_UpdateToReliableMessages( void ) +static void SV_UpdateToReliableMessages( void ) { sv_client_t *cl; int i; diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c index e7045df3..71572bce 100644 --- a/engine/server/sv_init.c +++ b/engine/server/sv_init.c @@ -56,7 +56,7 @@ SV_SendSingleResource hot precache on a flying ================ */ -void SV_SendSingleResource( const char *name, resourcetype_t type, int index, byte flags ) +static void SV_SendSingleResource( const char *name, resourcetype_t type, int index, byte flags ) { resource_t *pResource = &sv.resources[sv.num_resources]; int nSize = 0; @@ -284,7 +284,7 @@ static resourcetype_t SV_DetermineResourceType( const char *filename ) return t_generic; } -void SV_ReadResourceList( const char *filename ) +static void SV_ReadResourceList( const char *filename ) { string token; byte *afile; @@ -334,7 +334,7 @@ SV_CreateGenericResources loads external resource list ================ */ -void SV_CreateGenericResources( void ) +static void SV_CreateGenericResources( void ) { string filename; @@ -353,7 +353,7 @@ SV_CreateResourceList add resources to common list ================ */ -void SV_CreateResourceList( void ) +static void SV_CreateResourceList( void ) { qboolean ffirstsent = false; int i, nSize; @@ -418,7 +418,7 @@ void SV_CreateResourceList( void ) SV_WriteVoiceCodec ================ */ -void SV_WriteVoiceCodec( sizebuf_t *msg ) +static void SV_WriteVoiceCodec( sizebuf_t *msg ) { MSG_BeginServerCmd( msg, svc_voiceinit ); MSG_WriteString( msg, VOICE_DEFAULT_CODEC ); @@ -436,7 +436,7 @@ baseline will be transmitted INTERNAL RESOURCE ================ */ -void SV_CreateBaseline( void ) +static void SV_CreateBaseline( void ) { entity_state_t nullstate, *base; int playermodel; @@ -758,7 +758,7 @@ SV_SetupClients determine the game type and prepare clients ================ */ -void SV_SetupClients( void ) +static void SV_SetupClients( void ) { qboolean changed_maxclients = false; diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c index 5a67303d..5942f4ee 100644 --- a/engine/server/sv_main.c +++ b/engine/server/sv_main.c @@ -156,7 +156,7 @@ SV_HasActivePlayers returns true if server have spawned players ================ */ -qboolean SV_HasActivePlayers( void ) +static qboolean SV_HasActivePlayers( void ) { int i; @@ -244,7 +244,7 @@ void SV_UpdateMovevars( qboolean initialize ) SV_CheckCmdTimes ================= */ -void SV_CheckCmdTimes( void ) +static void SV_CheckCmdTimes( void ) { sv_client_t *cl; static double lastreset = 0; @@ -370,7 +370,7 @@ void SV_ProcessFile( sv_client_t *cl, const char *filename ) SV_ReadPackets ================= */ -void SV_ReadPackets( void ) +static void SV_ReadPackets( void ) { sv_client_t *cl; int i, qport; @@ -488,7 +488,7 @@ for a few seconds to make sure any final reliable message gets resent if necessary ================== */ -void SV_CheckTimeouts( void ) +static void SV_CheckTimeouts( void ) { sv_client_t *cl; double droppoint; @@ -593,7 +593,7 @@ qboolean SV_IsSimulating( void ) SV_RunGameFrame ================= */ -qboolean SV_RunGameFrame( void ) +static qboolean SV_RunGameFrame( void ) { sv.simulating = SV_IsSimulating(); diff --git a/engine/server/sv_move.c b/engine/server/sv_move.c index 48753f21..e62bfd46 100644 --- a/engine/server/sv_move.c +++ b/engine/server/sv_move.c @@ -429,7 +429,7 @@ qboolean SV_MoveTest( edict_t *ent, vec3_t move, qboolean relink ) } } -qboolean SV_StepDirection( edict_t *ent, float yaw, float dist ) +static qboolean SV_StepDirection( edict_t *ent, float yaw, float dist ) { int ret; float cSin, cCos; @@ -445,7 +445,7 @@ qboolean SV_StepDirection( edict_t *ent, float yaw, float dist ) return ret; } -qboolean SV_FlyDirection( edict_t *ent, vec3_t move ) +static qboolean SV_FlyDirection( edict_t *ent, vec3_t move ) { int ret; @@ -455,7 +455,7 @@ qboolean SV_FlyDirection( edict_t *ent, vec3_t move ) return ret; } -void SV_NewChaseDir( edict_t *actor, vec3_t destination, float dist ) +static void SV_NewChaseDir( edict_t *actor, vec3_t destination, float dist ) { float deltax, deltay; float tempdir, olddir, turnaround; diff --git a/engine/server/sv_phys.c b/engine/server/sv_phys.c index 52b04ae7..29fd6a9f 100644 --- a/engine/server/sv_phys.c +++ b/engine/server/sv_phys.c @@ -1958,7 +1958,7 @@ SV_GetLightStyle needs to get correct working SV_LightPoint ================== */ -const char *GAME_EXPORT SV_GetLightStyle( int style ) +static const char *GAME_EXPORT SV_GetLightStyle( int style ) { if( style < 0 ) style = 0; if( style >= MAX_LIGHTSTYLES )