From da2d020a143ebb13d4e3cfb3a360bdb763bf9251 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Fri, 14 Oct 2011 17:03:59 +0000 Subject: 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] mhm [18:58:15] Ensiform: it doesnt break anything? [18:59:20] nah --- src/server/sv_world.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') 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; } -- cgit