fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix freecs contents values

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5381 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-01-14 15:47:26 +00:00
parent 960d1c3616
commit a82b367d8c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
engine/server/world.c
View file

@ -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. //even if the trace traveled less, we still care if it was in a solid.
clip->trace.startsolid |= trace.startsolid; clip->trace.startsolid |= trace.startsolid;
clip->trace.allsolid |= trace.allsolid; 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). 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; 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. //even if the trace traveled less, we still care if it was in a solid.
clip->trace.startsolid |= trace.startsolid; clip->trace.startsolid |= trace.startsolid;
clip->trace.allsolid |= trace.allsolid; clip->trace.allsolid |= trace.allsolid;
clip->trace.contents |= trace.contents;
if (!clip->trace.ent) if (!clip->trace.ent)
{
clip->trace.ent = touch; clip->trace.ent = touch;
}
} }
} }