r5088 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-23 15:32:38 -0500 (Sun, 23 Nov 2008)
New Revision: 5088

Modified:
   trunk/data/qcsrc/server/cl_physics.qc
Log:
disable planar jump when touchexplode


Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2008-11-23 20:30:41 UTC (rev 5087)
+++ trunk/data/qcsrc/server/cl_physics.qc	2008-11-23 20:32:38 UTC (rev 5088)
@@ -245,7 +245,7 @@
 		rigvel_xy = rigvel;
 		rigvel_xy_z = 0;
 
-		if(g_bugrigs_planar_movement_car_jumping)
+		if(g_bugrigs_planar_movement_car_jumping && !g_touchexplode) // touchexplode is a better way to handle collisions
 			mt = MOVE_NORMAL;
 		else
 			mt = MOVE_NOMONSTERS;