diff --git a/engine/client/s_mix.c b/engine/client/s_mix.c index 8ab4ba39..19f5d26a 100644 --- a/engine/client/s_mix.c +++ b/engine/client/s_mix.c @@ -111,20 +111,20 @@ static void S_TransferPaintBuffer( int endtime ) //=============================================================================== // Activate a paintbuffer. All active paintbuffers are mixed in parallel within // MIX_MixChannelsToPaintbuffer, according to flags -_inline void MIX_ActivatePaintbuffer( int ipaintbuffer ) +static void MIX_ActivatePaintbuffer( int ipaintbuffer ) { Assert( ipaintbuffer < CPAINTBUFFERS ); paintbuffers[ipaintbuffer].factive = true; } -_inline void MIX_SetCurrentPaintbuffer( int ipaintbuffer ) +static void MIX_SetCurrentPaintbuffer( int ipaintbuffer ) { Assert( ipaintbuffer < CPAINTBUFFERS ); g_curpaintbuffer = paintbuffers[ipaintbuffer].pbuf; Assert( g_curpaintbuffer != NULL ); } -_inline int MIX_GetCurrentPaintbufferIndex( void ) +static int MIX_GetCurrentPaintbufferIndex( void ) { int i; @@ -136,7 +136,7 @@ _inline int MIX_GetCurrentPaintbufferIndex( void ) return 0; } -_inline paintbuffer_t *MIX_GetCurrentPaintbufferPtr( void ) +static paintbuffer_t *MIX_GetCurrentPaintbufferPtr( void ) { int ipaint = MIX_GetCurrentPaintbufferIndex(); @@ -145,7 +145,7 @@ _inline paintbuffer_t *MIX_GetCurrentPaintbufferPtr( void ) } // Don't mix into any paintbuffers -_inline void MIX_DeactivateAllPaintbuffers( void ) +static void MIX_DeactivateAllPaintbuffers( void ) { int i; @@ -154,7 +154,7 @@ _inline void MIX_DeactivateAllPaintbuffers( void ) } // set upsampling filter indexes back to 0 -_inline void MIX_ResetPaintbufferFilterCounters( void ) +static void MIX_ResetPaintbufferFilterCounters( void ) { int i; @@ -163,13 +163,13 @@ _inline void MIX_ResetPaintbufferFilterCounters( void ) } // return pointer to front paintbuffer pbuf, given index -_inline portable_samplepair_t *MIX_GetPFrontFromIPaint( int ipaintbuffer ) +static portable_samplepair_t *MIX_GetPFrontFromIPaint( int ipaintbuffer ) { Assert( ipaintbuffer < CPAINTBUFFERS ); return paintbuffers[ipaintbuffer].pbuf; } -_inline paintbuffer_t *MIX_GetPPaintFromIPaint( int ipaint ) +static paintbuffer_t *MIX_GetPPaintFromIPaint( int ipaint ) { Assert( ipaint < CPAINTBUFFERS ); return &paintbuffers[ipaint]; @@ -630,7 +630,7 @@ static void MIX_MixChannelsToPaintbuffer( int endtime, int rate, int outputRate } // pass in index -1...count+2, return pointer to source sample in either paintbuffer or delay buffer -_inline portable_samplepair_t *S_GetNextpFilter( int i, portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem ) +static portable_samplepair_t *S_GetNextpFilter( int i, portable_samplepair_t *pbuffer, portable_samplepair_t *pfiltermem ) { // The delay buffer is assumed to precede the paintbuffer by 6 duplicated samples if( i == -1 ) return (&(pfiltermem[0]));