X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=server.h;h=57eef855e2cdf1375da85a14f407ce2d3e970941;hb=89b8278762db0ca3e7de1b9f9ac70bb93f1ac6c7;hp=59d0eca3bf9ba3ebbe5590f003ee336e8722a8e4;hpb=05441557527d65d14e141fbf7ae50c9bf11ae486;p=xonotic%2Fdarkplaces.git

diff --git a/server.h b/server.h
index 59d0eca3..57eef855 100644
--- a/server.h
+++ b/server.h
@@ -214,9 +214,9 @@ typedef struct client_s
 	/// communications handle
 	netconn_t *netconnection;
 
-	int movesequence;
+	unsigned int movesequence;
 	signed char movement_count[NETGRAPH_PACKETS];
-	int movement_highestsequence_seen; // not the same as movesequence if prediction is off
+	unsigned int movement_highestsequence_seen; // not the same as movesequence if prediction is off
 	/// movement
 	usercmd_t cmd;
 	/// intended motion calced from cmd
@@ -312,7 +312,7 @@ typedef struct client_s
 
 	// last sent move sequence
 	// if the move sequence changed, an empty entity frame is sent
-	int lastmovesequence;
+	unsigned int lastmovesequence;
 } client_t;
 
 
@@ -335,6 +335,8 @@ typedef struct client_s
 #define MOVETYPE_FAKEPUSH		13		///< tenebrae's push that doesn't push
 #define MOVETYPE_PHYSICS		32		///< indicates this object is physics controlled
 #define MOVETYPE_FLY_WORLDONLY		33		///< like MOVETYPE_FLY, but uses MOVE_WORLDONLY for all its traces; objects of this movetype better be SOLID_NOT or SOLID_TRIGGER please, or else...
+#define MOVETYPE_USER_FIRST		128		///< user defined movetypes
+#define MOVETYPE_USER_LAST		191
 
 // edict->solid values
 #define	SOLID_NOT				0		///< no interaction with other objects
@@ -575,12 +577,12 @@ qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent);
 /// calculates hitsupercontentsmask for a generic qc entity
 int SV_GenericHitSuperContentsMask(const prvm_edict_t *edict);
 /// traces a box move against worldmodel and all entities in the specified area
-trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, float extend);
-trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, float extend);
-trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask);
+trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, float extend);
+trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, float extend);
+trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask);
 int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_edict_t **resultedicts);
 
-qboolean SV_CanSeeBox(int numsamples, vec_t enlarge, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs);
+qboolean SV_CanSeeBox(int numsamples, vec_t eyejitter, vec_t enlarge, vec3_t eye, vec3_t entboxmins, vec3_t entboxmaxs);
 
 int SV_PointSuperContents(const vec3_t point);