fixed GL_Scissor call in rtlight code (apparently I need to feed it a top to bottom...

[xonotic/darkplaces.git] / server.h

diff --git a/server.h b/server.h
index 363a57577af22b20d11e26eeca9e75523289153c..90c42bbc518f2b8d9191d5aeec5ca9f6df2d0e4c 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;
@@ -83,15 +84,15 @@ typedef struct
        server_state_t state;
 
        sizebuf_t datagram;
-       qbyte datagram_buf[MAX_DATAGRAM];
+       qbyte datagram_buf[NET_MAXMESSAGE];
 
        // copied to all clients at end of frame
        sizebuf_t reliable_datagram;
-       qbyte reliable_datagram_buf[MAX_DATAGRAM];
+       qbyte reliable_datagram_buf[NET_MAXMESSAGE];
 
        sizebuf_t signon;
-       // LordHavoc: increased signon message buffer from 8192 to 32768
-       qbyte signon_buf[32768];
+       // LordHavoc: increased signon message buffer from 8192
+       qbyte signon_buf[NET_MAXMESSAGE];
 } server_t;
 
 
@@ -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;
@@ -108,12 +109,16 @@ typedef struct client_s
        qboolean dropasap;
        // only valid before spawned
        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;
 
        // communications handle
-       struct qsocket_s *netconnection;
+       netconn_t *netconnection;
 
        // movement
        usercmd_t cmd;
@@ -122,38 +127,37 @@ typedef struct client_s
 
        // can be added to at any time, copied and clear once per frame
        sizebuf_t message;
-       qbyte msgbuf[MAX_DATAGRAM];
+       qbyte msgbuf[NET_MAXMESSAGE];
        // EDICT_NUM(clientnum+1)
        edict_t *edict;
-       // for printing to other people
-       char name[32];
-       int colors;
 
        float ping_times[NUM_PING_TIMES];
        // ping_times[num_pings%NUM_PING_TIMES]
        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];
 
-// client known data for deltas
-       int old_frags;
+       // properties that are sent across the network only when changed
+       char name[64], old_name[64];
+       int colors, old_colors;
+       int frags, old_frags;
+       // other properties not sent across the network
        int pmodel;
 
+       // visibility state
+       float visibletime[MAX_EDICTS];
 #ifdef QUAKEENTITIES
        // delta compression state
        float nextfullupdate[MAX_EDICTS];
-#endif
-       // visibility state
-       float visibletime[MAX_EDICTS];
-
-#ifndef QUAKEENTITIES
+#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;
 
@@ -174,6 +178,7 @@ typedef struct client_s
 #define        MOVETYPE_BOUNCE                 10
 #define MOVETYPE_BOUNCEMISSILE 11              // bounce w/o gravity
 #define MOVETYPE_FOLLOW                        12              // track movement of aiment
+#define MOVETYPE_FAKEPUSH              13              // tenebrae's push that doesn't push
 
 // edict->solid values
 #define        SOLID_NOT                               0               // no interaction with other objects
@@ -245,10 +250,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
@@ -273,6 +280,8 @@ void SV_DropClient (qboolean crash);
 void SV_SendClientMessages (void);
 void SV_ClearDatagram (void);
 
+void SV_ReadClientMessage(void);
+
 int SV_ModelIndex (const char *name);
 
 void SV_SetIdealPitch (void);
@@ -280,7 +289,6 @@ void SV_SetIdealPitch (void);
 void SV_AddUpdates (void);
 
 void SV_ClientThink (void);
-void SV_AddClientToServer (struct qsocket_s    *ret);
 
 void SV_ClientPrintf (const char *fmt, ...);
 void SV_BroadcastPrintf (const char *fmt, ...);
@@ -294,13 +302,10 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg);
 
 void SV_MoveToGoal (void);
 
-void SV_CheckForNewClients (void);
 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