X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=client.h;h=338f2ba641273c6f1191c13c156dba4c6f784abe;hp=3988bec7685d914d044116c5a24f46540aaac45b;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=d39f8c7e0427be77cc7dfa504fee8cbccf1684f6

diff --git a/client.h b/client.h
index 3988bec7..338f2ba6 100644
--- a/client.h
+++ b/client.h
@@ -132,9 +132,8 @@ typedef struct rtlight_s
 	int isstatic;
 	// true if this is a compiled world light, cleared if the light changes
 	int compiled;
-	// premade shadow volumes and lit surfaces to render for world entity
+	// premade shadow volumes to render for world entity
 	shadowmesh_t *static_meshchain_shadow;
-	shadowmesh_t *static_meshchain_light;
 	// used for visibility testing (more exact than bbox)
 	int static_numleafs;
 	int static_numleafpvsbytes;
@@ -244,8 +243,11 @@ typedef struct entity_render_s
 	model_t *model;
 	// current uninterpolated animation frame (for things which do not use interpolation)
 	int frame;
-	// entity shirt and pants colors
+	// entity shirt and pants colors (-1 if not colormapped)
 	int colormap;
+	// literal colors for renderer
+	vec3_t colormap_pantscolor;
+	vec3_t colormap_shirtcolor;
 	// light, particles, etc
 	int effects;
 	// for Alias models
@@ -553,6 +555,11 @@ typedef struct
 	qboolean onground;
 	qboolean inwater;
 
+	// used by bob
+	qboolean oldonground;
+	double lastongroundtime;
+	double hitgroundtime;
+
 	// don't change view angle, full screen, etc
 	int intermission;
 	// latched at intermission start
@@ -902,7 +909,7 @@ typedef struct
 }
 refdef_t;
 
-refdef_t r_refdef;
+extern refdef_t r_refdef;
 
 #include "cgamevm.h"