X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=progs.h;h=51e1c9da7efbef4d1d8c98bb317d9855734186de;hb=fd9860c8c2d7ff69fe2e49958e93cc9ed6c179ac;hp=695602240e62557d5c71badd9014a763d82e4d84;hpb=52346e02f29e08dd01f1b723245d06a214700a26;p=xonotic%2Fdarkplaces.git

diff --git a/progs.h b/progs.h
index 69560224..51e1c9da 100644
--- a/progs.h
+++ b/progs.h
@@ -32,6 +32,10 @@ typedef struct edict_engineprivate_s
 	// sv.time when the object was freed (to prevent early reuse which could
 	// mess up client interpolation or obscure severe QuakeC bugs)
 	float freetime;
+	// mark for the leak detector
+	int mark;
+	// place in the code where it was allocated (for the leak detector)
+	const char *allocation_origin;
 	// initially false to prevent projectiles from moving on their first frame
 	// (even if they were spawned by an synchronous client think)
 	qboolean move;
@@ -55,6 +59,11 @@ typedef struct edict_engineprivate_s
 
 	// LordHavoc: gross hack to make floating items still work
 	int suspendedinairflag;
+
+	// cached position to avoid redundant SV_CheckWaterTransition calls on monsters
+	qboolean waterposition_forceupdate; // force an update on this entity (set by SV_PushMove code for moving water entities)
+	vec3_t waterposition_origin; // updates whenever this changes
+
 	// used by PushMove to keep track of where objects were before they were
 	// moved, in case they need to be moved back
 	vec3_t moved_from;