Factorized audio CD code

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 8eb1153d3ffea391210abe30b3fa0e87656c1203..fdc94cd2187d28b53c59c1e6dfa54776082cc9bf 100644 (file)
--- a/server.h
+++ b/server.h
@@ -24,8 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct
 {
+       // number of svs.clients slots (updated by maxplayers command)
        int maxclients;
-       // [maxclients]
+       // client slots
        struct client_s *clients;
        // episode completion information
        int serverflags;
@@ -100,7 +101,7 @@ typedef struct
 
 typedef struct client_s
 {
-       // false = client is free
+       // false = empty client slot
        qboolean active;
        // false = don't send datagrams
        qboolean spawned;
@@ -110,6 +111,8 @@ typedef struct client_s
        qboolean sendsignon;
        // remove this client immediately
        qboolean deadsocket;
+       // index of this client in the svs.clients array
+       int number;
 
        // reliable messages must be sent periodically
        double last_message;
@@ -133,8 +136,6 @@ typedef struct client_s
        int num_pings;
        // LordHavoc: can be used for prediction or whatever...
        float ping;
-       // LordHavoc: specifically used for prediction, accounts for sys_ticrate too
-       float latency;
 
 // spawn parms are carried from level to level
        float spawn_parms[NUM_SPAWN_PARMS];
@@ -151,9 +152,12 @@ typedef struct client_s
 #ifdef QUAKEENTITIES
        // delta compression state
        float nextfullupdate[MAX_EDICTS];
-#else
+#elif 0
        entity_database_t entitydatabase;
        int entityframenumber; // incremented each time an entity frame is sent
+#else
+       entity_database4_t *entitydatabase4;
+       int entityframenumber; // incremented each time an entity frame is sent
 #endif
 } client_t;
 
@@ -245,10 +249,12 @@ extern cvar_t sv_maxspeed;
 extern cvar_t sv_accelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
-extern cvar_t sv_predict;
 extern cvar_t sv_stepheight;
 extern cvar_t sv_jumpstep;
 
+extern mempool_t *sv_clients_mempool;
+extern mempool_t *sv_edicts_mempool;
+
 // persistant server info
 extern server_static_t svs;
 // local server
@@ -299,8 +305,6 @@ void SV_RunClients (void);
 void SV_SaveSpawnparms (void);
 void SV_SpawnServer (const char *server);
 
-void SV_SetMaxClients(int n);
-
 void SV_CheckVelocity (edict_t *ent);
 
 #endif