X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=7b1ce0c61570c0428480322f96777b56e5200c11;hb=4e7ebb140abcc961cc07aba5f643b1a48524d8e7;hp=ed44332e8c0214030f267478f52fa80f03da248d;hpb=fc3e761aed3d3f464d133120b02d4ec14144de0c;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index ed44332e..7b1ce0c6 100644
--- a/server.h
+++ b/server.h
@@ -98,9 +98,12 @@ typedef struct server_s
 	world_t world;
 
 	/// map name
-	char name[64];
-	/// maps/<name>.bsp, for model_precache[0]
-	char modelname[64];
+	char name[64]; // %s followed by entrance name
+	// variants of map name
+	char worldmessage[40]; // map title (not related to filename)
+	char worldbasename[MAX_QPATH]; // %s
+	char worldname[MAX_QPATH]; // maps/%s.bsp
+	char worldnamenoextension[MAX_QPATH]; // maps/%s
 	struct model_s *worldmodel;
 	// NULL terminated
 	// LordHavoc: precaches are now MAX_QPATH rather than a pointer
@@ -142,10 +145,11 @@ typedef struct server_s
 	int writeentitiestoclient_cliententitynumber;
 	int writeentitiestoclient_clientnumber;
 	sizebuf_t *writeentitiestoclient_msg;
-	vec3_t writeentitiestoclient_testeye;
+	vec3_t writeentitiestoclient_eyes[MAX_CLIENTNETWORKEYES];
+	int writeentitiestoclient_numeyes;
 	int writeentitiestoclient_pvsbytes;
 	unsigned char writeentitiestoclient_pvs[MAX_MAP_LEAFS/8];
-	entity_state_t writeentitiestoclient_sendstates[MAX_EDICTS];
+	const entity_state_t *writeentitiestoclient_sendstates[MAX_EDICTS];
 	unsigned short writeentitiestoclient_csqcsendstates[MAX_EDICTS];
 
 	int numsendentities;
@@ -198,6 +202,8 @@ typedef struct client_s
 	netconn_t *netconnection;
 
 	int movesequence;
+	signed char movement_count[NETGRAPH_PACKETS];
+	int movement_highestsequence_seen; // not the same as movesequence if prediction is off
 	/// movement
 	usercmd_t cmd;
 	/// intended motion calced from cmd
@@ -310,6 +316,7 @@ typedef struct client_s
 #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
+#define MOVETYPE_PHYSICS		32		///< indicates this object is physics controlled
 
 // edict->solid values
 #define	SOLID_NOT				0		///< no interaction with other objects
@@ -319,6 +326,10 @@ typedef struct client_s
 #define	SOLID_BSP				4		///< bsp clip, touch on edge, block
 // LordHavoc: corpse code
 #define	SOLID_CORPSE			5		///< same as SOLID_BBOX, except it behaves as SOLID_NOT against SOLID_SLIDEBOX objects (players/monsters)
+// LordHavoc: physics
+#define	SOLID_PHYSICS_BOX		32		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
+#define	SOLID_PHYSICS_SPHERE	33		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
+#define	SOLID_PHYSICS_CAPSULE	34		///< physics object (mins, maxs, mass, origin, axis_forward, axis_left, axis_up, velocity, spinvelocity)
 
 // edict->deadflag values
 #define	DEAD_NO					0
@@ -379,7 +390,11 @@ extern cvar_t sv_airaccelerate;
 extern cvar_t sv_airstopaccelerate;
 extern cvar_t sv_airstrafeaccelerate;
 extern cvar_t sv_maxairstrafespeed;
+extern cvar_t sv_airstrafeaccel_qw;
 extern cvar_t sv_aircontrol;
+extern cvar_t sv_aircontrol_power;
+extern cvar_t sv_aircontrol_penalty;
+extern cvar_t sv_airspeedlimit_nonqw;
 extern cvar_t sv_allowdownloads;
 extern cvar_t sv_allowdownloads_archive;
 extern cvar_t sv_allowdownloads_config;
@@ -409,22 +424,28 @@ extern cvar_t sv_fixedframeratesingleplayer;
 extern cvar_t sv_freezenonclients;
 extern cvar_t sv_friction;
 extern cvar_t sv_gameplayfix_blowupfallenzombies;
+extern cvar_t sv_gameplayfix_consistentplayerprethink;
 extern cvar_t sv_gameplayfix_delayprojectiles;
 extern cvar_t sv_gameplayfix_droptofloorstartsolid;
 extern cvar_t sv_gameplayfix_droptofloorstartsolid_nudgetocorrect;
 extern cvar_t sv_gameplayfix_easierwaterjump;
 extern cvar_t sv_gameplayfix_findradiusdistancetobox;
+extern cvar_t sv_gameplayfix_gravityunaffectedbyticrate;
+extern cvar_t sv_gameplayfix_nogravityonground;
 extern cvar_t sv_gameplayfix_grenadebouncedownslopes;
 extern cvar_t sv_gameplayfix_multiplethinksperframe;
-extern cvar_t sv_gameplayfix_slidemoveprojectiles;
 extern cvar_t sv_gameplayfix_noairborncorpse;
 extern cvar_t sv_gameplayfix_noairborncorpse_allowsuspendeditems;
+extern cvar_t sv_gameplayfix_nudgeoutofsolid;
+extern cvar_t sv_gameplayfix_nudgeoutofsolid_bias;
 extern cvar_t sv_gameplayfix_setmodelrealbox;
+extern cvar_t sv_gameplayfix_slidemoveprojectiles;
 extern cvar_t sv_gameplayfix_stepdown;
 extern cvar_t sv_gameplayfix_stepwhilejumping;
+extern cvar_t sv_gameplayfix_stepmultipletimes;
 extern cvar_t sv_gameplayfix_swiminbmodels;
 extern cvar_t sv_gameplayfix_upwardvelocityclearsongroundflag;
-extern cvar_t sv_gameplayfix_gravityunaffectedbyticrate;
+extern cvar_t sv_gameplayfix_downtracesupportsongroundflag;
 extern cvar_t sv_gravity;
 extern cvar_t sv_idealpitchscale;
 extern cvar_t sv_jumpstep;
@@ -433,7 +454,6 @@ extern cvar_t sv_maxairspeed;
 extern cvar_t sv_maxrate;
 extern cvar_t sv_maxspeed;
 extern cvar_t sv_maxvelocity;
-extern cvar_t sv_newflymove;
 extern cvar_t sv_nostep;
 extern cvar_t sv_playerphysicsqc;
 extern cvar_t sv_progs;
@@ -486,6 +506,9 @@ 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);
+
 void SV_SetIdealPitch (void);
 
 void SV_AddUpdates (void);
@@ -499,7 +522,7 @@ void SV_BroadcastPrintf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 
 void SV_Physics (void);
 void SV_Physics_ClientMove (void);
-void SV_Physics_ClientEntity (prvm_edict_t *ent);
+//void SV_Physics_ClientEntity (prvm_edict_t *ent);
 
 qboolean SV_PlayerCheckGround (prvm_edict_t *ent);
 qboolean SV_CheckBottom (prvm_edict_t *ent);
@@ -507,9 +530,11 @@ qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean
 
 /*! Needs to be called any time an entity changes origin, mins, maxs, or solid
  * sets ent->v.absmin and ent->v.absmax
- * if touchtriggers, calls prog functions for the intersected triggers
+ * call TouchAreaGrid as well to fire triggers that overlap the box
  */
-void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers);
+void SV_LinkEdict(prvm_edict_t *ent);
+void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent);
+void SV_LinkEdict_TouchAreaGrid_Call(prvm_edict_t *touch, prvm_edict_t *ent); // if we detected a touch from another source
 
 /*! move an entity that is stuck by small amounts in various directions to try to nudge it back into the collision hull
  * returns true if it found a better place
@@ -523,6 +548,8 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
 trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask);
 trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask);
 
+qboolean SV_CanSeeBox(int numsamples, vec_t enlarge, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs);
+
 int SV_PointSuperContents(const vec3_t point);
 
 void SV_FlushBroadcastMessages(void);
@@ -543,5 +570,8 @@ void SV_VM_End(void);
 
 const char *Host_TimingReport(void); ///< for output in Host_Status_f
 
+int SV_GetPitchSign(prvm_edict_t *ent);
+void SV_GetEntityMatrix (prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatrix);
+
 #endif