X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=client.h;h=57d50dd1bcfa3dce58ccd243943370dcd9f9a494;hb=8b0fbc64175362acf3ea872029a423012b76a4f8;hp=af4134347343ac1a33145f132ab8c4ca4fd4758e;hpb=2d5c40b14b6bdba99443bd22b68e3dcddc345801;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index af413434..57d50dd1 100644
--- a/client.h
+++ b/client.h
@@ -215,6 +215,10 @@ typedef struct rtlight_s
 	int particlecache_maxparticles;
 	int particlecache_updateparticle;
 	rtlight_particle_t *particlecache_particles;
+
+	/// bouncegrid light info
+	float photoncolor[3];
+	float photons;
 }
 rtlight_t;
 
@@ -291,18 +295,6 @@ typedef struct dlight_s
 }
 dlight_t;
 
-#define MAX_FRAMEGROUPBLENDS 4
-typedef struct framegroupblend_s
-{
-	// animation number and blend factor
-	// (for most models this is the frame number)
-	int frame;
-	float lerp;
-	// time frame began playing (for framegroup animations)
-	double start;
-}
-framegroupblend_t;
-
 // this is derived from processing of the framegroupblend array
 // note: technically each framegroupblend can produce two of these, but that
 // never happens in practice because no one blends between more than 2
@@ -1216,6 +1208,7 @@ typedef struct client_state_s
 	float movevars_maxairspeed;
 	float movevars_stepheight;
 	float movevars_airaccel_qw;
+	float movevars_airaccel_qw_stretchfactor;
 	float movevars_airaccel_sideways_friction;
 	float movevars_airstopaccelerate;
 	float movevars_airstrafeaccelerate;
@@ -1255,8 +1248,11 @@ typedef struct client_state_s
 	// server entity number corresponding to a clientside entity
 	unsigned short csqc_server2csqcentitynumber[MAX_EDICTS];
 	qboolean csqc_loaded;
-	vec3_t csqc_origin;
-	vec3_t csqc_angles;
+	vec3_t csqc_vieworigin;
+	vec3_t csqc_viewangles;
+	vec3_t csqc_vieworiginfromengine;
+	vec3_t csqc_viewanglesfromengine;
+	matrix4x4_t csqc_viewmodelmatrixfromengine;
 	qboolean csqc_usecsqclistener;
 	matrix4x4_t csqc_listenermatrix;
 	char csqc_printtextbuf[MAX_INPUTLINE];
@@ -1274,6 +1270,9 @@ typedef struct client_state_s
 	// freed on each level change
 	size_t buildlightmapmemorysize;
 	unsigned char *buildlightmapmemory;
+
+	// used by EntityState5_ReadUpdate
+	skeleton_t *engineskeletonobjects;
 }
 client_state_t;
 
@@ -1836,5 +1835,8 @@ r_refdef_t;
 
 extern r_refdef_t r_refdef;
 
+// warpzone prediction hack (CSQC builtin)
+void CL_RotateMoves(const matrix4x4_t *m);
+
 #endif