summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThilo Schulz <arny@ats.s.bawue.de>2011-10-14 17:03:59 +0000
committerTim Angus <tim@ngus.net>2013-01-10 23:38:31 +0000
commitda2d020a143ebb13d4e3cfb3a360bdb763bf9251 (patch)
tree4c2d77dab99efdbf01a390fd1a9c0ed85af3ece2 /src
parent438f5ea9c48452816b3874fc90561c54414b6dfc (diff)
<Ensiform> Thilo: http://pastebin.com/2UUmSCQK fixes point contents on the server side related to the cg fix with moving water. Dunno why s.origin and s.angles was ever used, the rest of sv_world.c always uses r.currentOrigin and r.currentAngles [18:58:10] <Thilo> mhm [18:58:15] <Thilo> Ensiform: it doesnt break anything? [18:59:20] <Ensiform> nah
Diffstat (limited to 'src')
-rw-r--r--src/server/sv_world.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/sv_world.c b/src/server/sv_world.c
index ce4230d7..921d90bc 100644
--- a/src/server/sv_world.c
+++ b/src/server/sv_world.c
@@ -673,12 +673,12 @@ int SV_PointContents( const vec3_t p, int passEntityNum ) {
hit = SV_GentityNum( touch[i] );
// might intersect, so do an exact clip
clipHandle = SV_ClipHandleForEntity( hit );
- angles = hit->s.angles;
+ angles = hit->r.currentAngles;
if ( !hit->r.bmodel ) {
angles = vec3_origin; // boxes don't rotate
}
- c2 = CM_TransformedPointContents (p, clipHandle, hit->s.origin, angles);
+ c2 = CM_TransformedPointContents (p, clipHandle, hit->r.currentOrigin, angles);
contents |= c2;
}