From eb50bd0d0b577f3ae51aa2a192a6fafb03a0a907 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 23 Nov 2008 20:32:38 +0000
Subject: [PATCH] disable planar jump when touchexplode

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5088 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/cl_physics.qc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index b220b210c..8bdc57792 100644
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -245,7 +245,7 @@ void RaceCarPhysics()
 		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;
-- 
2.39.2