X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=a64f43c6cbe1111bca15a53950162535cc8f88f3;hb=f9d8bc7ea04ff91fcbd90fe50a299b37724b349b;hp=a62603c70b460f7c7344674e637851f93649820e;hpb=847e005ddceb274eb237d5529d58482f40e2c880;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index a62603c7..a64f43c6 100644
--- a/server.h
+++ b/server.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef SERVER_H
 #define SERVER_H
 
-typedef struct
+typedef struct server_static_s
 {
 	// number of svs.clients slots (updated by maxplayers command)
 	int maxclients;
@@ -36,9 +36,9 @@ typedef struct
 
 //=============================================================================
 
-typedef enum {ss_loading, ss_active} server_state_t;
+typedef enum server_state_e {ss_loading, ss_active} server_state_t;
 
-typedef struct
+typedef struct server_s
 {
 	// false if only a net client
 	qboolean active;
@@ -48,9 +48,7 @@ typedef struct
 	qboolean loadgame;
 
 	// one of the PROTOCOL_ values
-	int protocol;
-	// this disables extensions when using PROTOCOL_QUAKE
-	qboolean netquakecompatible;
+	protocolversion_t protocol;
 
 	// used for running multiple steps in one frame, etc
 	double timer;
@@ -78,20 +76,9 @@ typedef struct
 	// updated by SV_SoundIndex
 	char sound_precache[MAX_SOUNDS][MAX_QPATH];
 	char lightstyles[MAX_LIGHTSTYLES][64];
-	int num_edicts;
-	int max_edicts;
-	// small edict_t structures which just contain pointers
-	// (allocated at server startup only)
-	edict_t *edicts;
-	// engine private edict information
-	// (dynamically resized - always access through edict_t!)
-	edict_engineprivate_t *edictsengineprivate;
-	// QuakeC fields array
-	// (dynamically resized - always access through edict_t!)
-	void *edictsfields;
 	// PushMove sometimes has to move entities back from a failed move
 	// (dynamically resized)
-	edict_t **moved_edicts;
+	prvm_edict_t **moved_edicts;
 	// some actions are only valid during load
 	server_state_t state;
 
@@ -107,14 +94,17 @@ typedef struct
 	qbyte signon_buf[NET_MAXMESSAGE];
 } server_t;
 
+// if defined this does ping smoothing, otherwise it does not
+//#define NUM_PING_TIMES 16
 
-#define NUM_PING_TIMES 16
 #define NUM_SPAWN_PARMS 16
 
 typedef struct client_s
 {
 	// false = empty client slot
 	qboolean active;
+	// false = don't do ClientDisconnect on drop
+	qboolean clientconnectcalled;
 	// false = don't send datagrams
 	qboolean spawned;
 	// has been told to go to another level
@@ -134,6 +124,7 @@ typedef struct client_s
 	// communications handle
 	netconn_t *netconnection;
 
+	int movesequence;
 	// movement
 	usercmd_t cmd;
 	// intended motion calced from cmd
@@ -142,12 +133,14 @@ typedef struct client_s
 	// can be added to at any time, copied and clear once per frame
 	sizebuf_t message;
 	qbyte msgbuf[NET_MAXMESSAGE];
-	// EDICT_NUM(clientnum+1)
-	edict_t *edict;
+	// 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
 	// LordHavoc: can be used for prediction or whatever...
 	float ping;
 
@@ -261,6 +254,7 @@ extern cvar_t sv_friction;
 extern cvar_t sv_edgefriction;
 extern cvar_t sv_stopspeed;
 extern cvar_t sv_maxspeed;
+extern cvar_t sv_maxairspeed;
 extern cvar_t sv_accelerate;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_aim;
@@ -287,15 +281,13 @@ extern server_t sv;
 
 extern client_t *host_client;
 
-extern jmp_buf host_abortserver;
-
 //===========================================================
 
 void SV_Init (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);
-void SV_StartSound (edict_t *entity, int channel, const char *sample, int volume, float attenuation);
+void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int volume, float attenuation);
 
 void SV_ConnectClient (int clientnum, netconn_t *netconnection);
 void SV_DropClient (qboolean crash);
@@ -325,11 +317,13 @@ 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);
+qboolean SV_PlayerCheckGround (prvm_edict_t *ent);
+qboolean SV_CheckBottom (prvm_edict_t *ent);
+qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink);
+
+struct trace_s SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents);
 
-void SV_WriteClientdataToMessage (client_t *client, edict_t *ent, sizebuf_t *msg, int *stats);
+void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t *msg, int *stats);
 
 void SV_MoveToGoal (void);
 
@@ -337,7 +331,12 @@ void SV_ApplyClientMove (void);
 void SV_SaveSpawnparms (void);
 void SV_SpawnServer (const char *server);
 
-void SV_CheckVelocity (edict_t *ent);
+void SV_CheckVelocity (prvm_edict_t *ent);
+
+void SV_SetupVM(void);
+
+void SV_VM_Begin(void);
+void SV_VM_End(void);
 
 #endif