changed collision code to report supercontents, surfaceflags, and texture that was...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index 28f908e89096ecb02e810f86c9c2b600c8c6967d..1e426d2481d2adcf5603a0348e292e92602bd542 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -101,6 +101,9 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
                                if (hitent)
                                        *hitent = cl.brushmodel_entities[n];
                                Matrix4x4_Transform3x3(&ent->matrix, trace.plane.normal, cliptrace.plane.normal);
+                               cliptrace.hitsupercontents = trace.hitsupercontents;
+                               cliptrace.hitq3surfaceflags = trace.hitq3surfaceflags;
+                               cliptrace.hittexture = trace.hittexture;
                        }
                        cliptrace.startsupercontents |= trace.startsupercontents;
                }
@@ -161,6 +164,9 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
                                        if (hitent)
                                                *hitent = n;
                                        Matrix4x4_Transform3x3(&ent->matrix, trace.plane.normal, cliptrace.plane.normal);
+                                       cliptrace.hitsupercontents = trace.hitsupercontents;
+                                       cliptrace.hitq3surfaceflags = trace.hitq3surfaceflags;
+                                       cliptrace.hittexture = trace.hittexture;
                                }
                                cliptrace.startsupercontents |= trace.startsupercontents;
                        }