diff --git a/engine/server/server.h b/engine/server/server.h index 8170491a..a485d1be 100644 --- a/engine/server/server.h +++ b/engine/server/server.h @@ -653,15 +653,12 @@ void SV_SendUserReg( sizebuf_t *msg, sv_user_message_t *user ); int pfnIndexOfEdict( const edict_t *pEdict ); void pfnWriteBytes( const byte *bytes, int count ); void SV_UpdateBaseVelocity( edict_t *ent ); -byte *pfnSetFatPVS( const float *org ); -byte *pfnSetFatPAS( const float *org ); int pfnPrecacheModel( const char *s ); int pfnModelIndex( const char *m ); void pfnRemoveEntity( edict_t* e ); void SV_RestartAmbientSounds( void ); void SV_RestartDecals( void ); void SV_RestartStaticEnts( void ); -int pfnGetCurrentPlayer( void ); int pfnDropToFloor( edict_t* e ); edict_t *SV_EdictNum( int n ); char *SV_Localinfo( void ); diff --git a/engine/server/sv_game.c b/engine/server/sv_game.c index f4a19cfe..02f9e34e 100644 --- a/engine/server/sv_game.c +++ b/engine/server/sv_game.c @@ -4188,6 +4188,21 @@ void GAME_EXPORT SV_PlaybackEventFull( int flags, const edict_t *pInvoker, word } } +/* +============= +pfnGetCurrentPlayer + +============= +*/ +static int GAME_EXPORT pfnGetCurrentPlayer( void ) +{ + int idx = sv.current_client - svs.clients; + + if( idx < 0 || idx >= svs.maxclients ) + return -1; + return idx; +} + /* ============= pfnSetFatPVS @@ -4196,7 +4211,7 @@ The client will interpolate the view position, so we can't use a single PVS point ============= */ -byte *pfnSetFatPVS( const float *org ) +static byte * GAME_EXPORT pfnSetFatPVS( const float *org ) { qboolean fullvis = false; @@ -4247,7 +4262,7 @@ The client will interpolate the hear position, so we can't use a single PHS point ============= */ -byte *pfnSetFatPAS( const float *org ) +static byte * GAME_EXPORT pfnSetFatPAS( const float *org ) { qboolean fullvis = false; @@ -4355,21 +4370,6 @@ int GAME_EXPORT pfnCanSkipPlayer( const edict_t *player ) return FBitSet( cl->flags, FCL_LOCAL_WEAPONS ) ? true : false; } -/* -============= -pfnGetCurrentPlayer - -============= -*/ -int GAME_EXPORT pfnGetCurrentPlayer( void ) -{ - int idx = sv.current_client - svs.clients; - - if( idx < 0 || idx >= svs.maxclients ) - return -1; - return idx; -} - /* ============= pfnSetGroupMask