X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=server.h;h=503d1b146aac2320fea96c8f8bfeebda599d5bad;hp=0d0346064cccd61e1bd9bd0cee774059d05ae67a;hb=aacd9507d824694ed13d9ba8c5c33c3aba87ab63;hpb=962759ddd16628af50c4f13fb1a463c545f9b473

diff --git a/server.h b/server.h
index 0d034606..503d1b14 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;
 
@@ -512,6 +504,10 @@ extern client_t *host_client;
 //===========================================================
 
 void SV_Init (void);
+double SV_Frame(double time);
+void SV_Shutdown(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);
@@ -521,6 +517,8 @@ void SV_StartPointSound (vec3_t origin, const char *sample, int volume, float at
 void SV_ConnectClient (int clientnum, netconn_t *netconnection);
 void SV_DropClient (qbool crash);
 
+void SV_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
+
 void SV_SendClientMessages(void);
 
 void SV_ReadClientMessage(void);
@@ -534,14 +532,14 @@ int SV_SoundIndex(const char *s, int precachemode);
 
 int SV_ParticleEffectIndex(const char *name);
 
-dp_model_t *SV_GetModelByIndex(int modelindex);
-dp_model_t *SV_GetModelFromEdict(prvm_edict_t *ed);
+model_t *SV_GetModelByIndex(int modelindex);
+model_t *SV_GetModelFromEdict(prvm_edict_t *ed);
 
 void SV_SetIdealPitch (void);
 
 void SV_AddUpdates (void);
 
-void SV_ClientThink (void);
+void SV_PlayerPhysics (void);
 
 void SV_ClientPrint(const char *msg);
 void SV_ClientPrintf(const char *fmt, ...) DP_FUNC_PRINTF(1);
@@ -599,7 +597,6 @@ 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);
@@ -629,4 +626,6 @@ void SV_PreSpawn_f(cmd_state_t *cmd);
 void SV_Spawn_f(cmd_state_t *cmd);
 void SV_Begin_f(cmd_state_t *cmd);
 
+qbool SV_VM_ConsoleCommand (const char *text);
+
 #endif