[quake3-commits] r2186 - trunk/code/server

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-10-14 13:03:59 -0400 (Fri, 14 Oct 2011)
New Revision: 2186

Modified:
   trunk/code/server/sv_world.c
Log:
[18:48:20] <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


Modified: trunk/code/server/sv_world.c
===================================================================
--- trunk/code/server/sv_world.c	2011-10-14 13:52:28 UTC (rev 2185)
+++ trunk/code/server/sv_world.c	2011-10-14 17:03:59 UTC (rev 2186)
@@ -672,12 +672,12 @@
 		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;
 	}