From a82b367d8c59e7ed64c8e69db733b7a853827413 Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 14 Jan 2019 15:47:26 +0000 Subject: [PATCH] fix freecs contents values git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5381 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/server/world.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/server/world.c b/engine/server/world.c index c4b25b40f..60e9302c2 100644 --- a/engine/server/world.c +++ b/engine/server/world.c @@ -2062,9 +2062,9 @@ static void World_ClipToLinks (world_t *w, areagridlink_t *node, moveclip_t *cli //even if the trace traveled less, we still care if it was in a solid. clip->trace.startsolid |= trace.startsolid; clip->trace.allsolid |= trace.allsolid; + clip->trace.contents |= trace.contents; if (!clip->trace.ent || trace.fraction == clip->trace.fraction) //xonotic requires that second test (DP has no check at all, which would end up reporting mismatched fraction/ent results, so yuck). { - clip->trace.contents = trace.contents; clip->trace.ent = touch; } } @@ -2206,8 +2206,11 @@ static void World_ClipToLinks (world_t *w, areanode_t *node, moveclip_t *clip) //even if the trace traveled less, we still care if it was in a solid. clip->trace.startsolid |= trace.startsolid; clip->trace.allsolid |= trace.allsolid; + clip->trace.contents |= trace.contents; if (!clip->trace.ent) + { clip->trace.ent = touch; + } } }