collision code cleanups (model->brush.TraceBox is now used for everything except...

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index d3f12f953a68898670a9b3b8a008b78c95249473..2de9ec8ff6dca8be2879d9ab6b01e25cfb4316f8 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -122,12 +122,13 @@ typedef struct model_sprite_s
 }
 model_sprite_t;
 
+struct trace_s;
+
 typedef struct model_brush_s
 {
        char *entities;
        void (*FindNonSolidLocation)(struct model_s *model, const vec3_t in, vec3_t out, vec_t radius);
-       int (*PointContents)(struct model_s *model, const float *p);
-       void (*TraceBox)(struct model_s *model, const vec3_t corigin, const vec3_t cangles, void *trace, const void *cent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end);
+       void (*TraceBox)(struct model_s *model, struct trace_s *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs);
 }
 model_brush_t;