X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=d970b84f07e4813da1b138f9b63c2b3230ee8397;hb=fedb845e665b669ff11df23ce713842bd89c4ec4;hp=480e1f644f6c9ac3150f177c94f869020002e718;hpb=0256e57e16a302ad45090618b8d6eb5930788809;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index 480e1f64..d970b84f 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -118,9 +118,6 @@ typedef struct model_s
 	// LordHavoc: sorted surface pointer array, sorted by shader type and then by texture
 	msurface_t		**modelsortedsurfaces; // [nummodelsurfaces]
 
-	// used for surfaces without a valid texture
-	texture_t		notexture;
-
 	// lightmap format, set to r_lightmaprgba when model is loaded
 	int				lightmaprgba;
 
@@ -195,15 +192,12 @@ typedef struct model_s
 	int				sprnum_type;
 	mspriteframe_t	*sprdata_frames;
 
-	// adds a box (or individual polygons) to the clipping engine,
-	// which will mark the entity visible if seen
-	void(*SERAddEntity)(void);
 	// draw the model
-	void(*Draw)(void);
+	void(*Draw)(struct entity_render_s *ent);
 	// draw the model's sky polygons (only used by brush models)
-	void(*DrawSky)(void);
+	void(*DrawSky)(struct entity_render_s *ent);
 	// draw the model's shadows
-	void(*DrawShadow)(void);
+	void(*DrawShadow)(struct entity_render_s *ent);
 
 	// memory pool for allocations
 	mempool_t		*mempool;
@@ -212,11 +206,16 @@ model_t;
 
 //============================================================================
 
+// this can be used for anything without a valid texture
+extern rtexture_t *r_notexture;
+// every texture must be in a pool...
+extern rtexturepool_t *r_notexturepool;
+
 // model loading
 extern model_t *loadmodel;
 extern qbyte *mod_base;
 // sky/water subdivision
-extern cvar_t gl_subdivide_size;
+//extern cvar_t gl_subdivide_size;
 // texture fullbrights
 extern cvar_t r_fullbrights;
 
@@ -227,9 +226,6 @@ model_t *Mod_ForName (char *name, qboolean crash, qboolean checkdisk, qboolean i
 void Mod_TouchModel (char *name);
 void Mod_UnloadModel (model_t *mod);
 
-mleaf_t *Mod_PointInLeaf (float *p, model_t *model);
-qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
-
 void Mod_ClearUsed(void);
 void Mod_PurgeUnused(void);