X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=8e94e5adb63cf76bd6af20a45dd7324e81a9a3d2;hb=95fc24b8cd29350daf39b2e5c85aa357d2710fe3;hp=490dd52c648080a5d17e7be2f6359cd7fb9a8eb0;hpb=8da4459b59336acc54dd028e44177756cbfa48cd;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 490dd52c..8e94e5ad 100644
--- a/server.h
+++ b/server.h
@@ -24,8 +24,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct
 {
-	// NULL pointers are non-existent clients
-	struct client_s *connectedclients[MAX_SCOREBOARD];
+	// number of svs.clients slots (updated by maxplayers command)
+	int maxclients;
+	// client slots
+	struct client_s *clients;
 	// episode completion information
 	int serverflags;
 	// cleared when at SV_SpawnServer
@@ -45,6 +47,11 @@ typedef struct
 	// handle connections specially
 	qboolean loadgame;
 
+	// one of the PROTOCOL_ values
+	int protocol;
+	// this disables extensions when using PROTOCOL_QUAKE
+	qboolean netquakecompatible;
+
 	double time;
 
 	double frametime;
@@ -82,15 +89,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;
 
 
@@ -99,6 +106,8 @@ typedef struct
 
 typedef struct client_s
 {
+	// false = empty client slot
+	qboolean active;
 	// false = don't send datagrams
 	qboolean spawned;
 	// has been told to go to another level
@@ -107,7 +116,7 @@ typedef struct client_s
 	qboolean sendsignon;
 	// remove this client immediately
 	qboolean deadsocket;
-	// index of this client in the svs.connectedclients pointer array
+	// index of this client in the svs.clients array
 	int number;
 
 	// reliable messages must be sent periodically
@@ -123,7 +132,7 @@ 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;
 
@@ -145,16 +154,13 @@ typedef struct client_s
 
 	// visibility state
 	float visibletime[MAX_EDICTS];
-#ifdef QUAKEENTITIES
-	// delta compression state
-	float nextfullupdate[MAX_EDICTS];
-#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
+
+	// prevent animated names
+	float nametime;
+
+	entityframe_database_t *entitydatabase;
+	entityframe4_database_t *entitydatabase4;
+	entityframe5_database_t *entitydatabase5;
 } client_t;
 
 
@@ -174,6 +180,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
@@ -247,7 +254,14 @@ extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
 extern cvar_t sv_stepheight;
 extern cvar_t sv_jumpstep;
-extern cvar_t sv_maxplayers;
+extern cvar_t sv_public;
+extern cvar_t sv_maxrate;
+
+extern cvar_t sv_gameplayfix_grenadebouncedownslopes;
+extern cvar_t sv_gameplayfix_noairborncorpse;
+extern cvar_t sv_gameplayfix_stepdown;
+extern cvar_t sv_gameplayfix_stepwhilejumping;
+extern cvar_t sv_gameplayfix_swiminbmodels;
 
 extern mempool_t *sv_clients_mempool;
 extern mempool_t *sv_edicts_mempool;
@@ -286,11 +300,14 @@ void SV_AddUpdates (void);
 
 void SV_ClientThink (void);
 
-void SV_ClientPrintf (const char *fmt, ...);
-void SV_BroadcastPrintf (const char *fmt, ...);
+void SV_ClientPrint(const char *msg);
+void SV_ClientPrintf(const char *fmt, ...);
+void SV_BroadcastPrint(const char *msg);
+void SV_BroadcastPrintf(const char *fmt, ...);
 
 void SV_Physics (void);
 
+qboolean SV_PlayerCheckGround (edict_t *ent);
 qboolean SV_CheckBottom (edict_t *ent);
 qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink);