X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=02d3786bb6319ec8450539e9695b7d15f69bb472;hp=283f1660dcf82d4e6449a9b77136816814d9b994;hb=e9206d59c8cde436ea29daa46a587db08f73a111;hpb=7c656ac03a03a5fa910f9cad3c4735ed62f7ab69 diff --git a/server.h b/server.h index 283f1660..02d3786b 100644 --- a/server.h +++ b/server.h @@ -179,9 +179,6 @@ typedef struct csqcentityframedb_s int sendflags[NUM_CSQCENTITIES_PER_FRAME]; } csqcentityframedb_t; -// if defined this does ping smoothing, otherwise it does not -//#define NUM_PING_TIMES 16 - #define NUM_SPAWN_PARMS 16 typedef struct client_s @@ -225,11 +222,6 @@ typedef struct client_s /// PRVM_EDICT_NUM(clientnum+1) prvm_edict_t *edict; -#ifdef NUM_PING_TIMES - float ping_times[NUM_PING_TIMES]; - /// ping_times[num_pings%NUM_PING_TIMES] - int num_pings; -#endif /// LadyHavoc: can be used for prediction or whatever... float ping; @@ -515,7 +507,7 @@ void SV_Init (void); double SV_Frame(double time); void SV_Shutdown(void); -int SV_IsLocalGame(void); +int SV_IsLocalServer(void); void SV_StartParticle (vec3_t org, vec3_t dir, int color, int count); void SV_StartEffect (vec3_t org, int modelindex, int startframe, int framecount, int framerate); @@ -523,7 +515,7 @@ void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int v void SV_StartPointSound (vec3_t origin, const char *sample, int volume, float attenuation, float speed); void SV_ConnectClient (int clientnum, netconn_t *netconnection); -void SV_DropClient (qbool crash); +void SV_DropClient (qbool leaving, const char *reason, ... ); void SV_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1); @@ -605,14 +597,13 @@ void VM_SV_MoveToGoal(prvm_prog_t *prog); void SV_ApplyClientMove (void); void SV_SaveSpawnparms (void); -qbool SV_IsLocalServer(void); void SV_SpawnServer (const char *map); void SV_CheckVelocity (prvm_edict_t *ent); void SV_SetupVM(void); -const char *Host_TimingReport(char *buf, size_t buflen); ///< for output in SV_Status_f +const char *SV_TimingReport(char *buf, size_t buflen); ///< for output in SV_Status_f int SV_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent); void SV_GetEntityMatrix(prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qbool viewmatrix);