r5084 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-23 06:29:46 -0500 (Sun, 23 Nov 2008)
New Revision: 5084

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_physics.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
g_bugrigs_planar_movement_car_jumping - a new bug is now on/off too


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-11-23 11:15:25 UTC (rev 5083)
+++ trunk/data/defaultNexuiz.cfg	2008-11-23 11:29:46 UTC (rev 5084)
@@ -1202,6 +1202,7 @@
 
 set g_bugrigs 0
 set g_bugrigs_planar_movement 1 // BROTRR bug emulation
+set g_bugrigs_planar_movement_car_jumping 1 // my own bug
 set g_bugrigs_reverse_speeding 1 // BROTRR bug emulation
 set g_bugrigs_reverse_spinning 1 // BROTRR bug emulation
 set g_bugrigs_reverse_stopping 1 // BROTRR bug emulation

Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2008-11-23 11:15:25 UTC (rev 5083)
+++ trunk/data/qcsrc/server/cl_physics.qc	2008-11-23 11:29:46 UTC (rev 5084)
@@ -239,20 +239,26 @@
 	if(g_bugrigs_planar_movement)
 	{
 		vector rigvel_xy, neworigin, up;
+		float mt;
 
 		rigvel_z -= frametime * sv_gravity; // 4x gravity plays better
 		rigvel_xy = rigvel;
 		rigvel_xy_z = 0;
 
-		tracebox(self.origin, self.mins, self.maxs, self.origin + '0 0 1024', MOVE_NORMAL, self);
+		if(g_bugrigs_planar_movement_car_jumping)
+			mt = MOVE_NORMAL;
+		else
+			mt = MOVE_NOMONSTERS;
+
+		tracebox(self.origin, self.mins, self.maxs, self.origin + '0 0 1024', mt, self);
 		up = trace_endpos - self.origin;
 
 		// BUG RIGS: align the move to the surface instead of doing collision testing
 		// can we move?
-		tracebox(trace_endpos, self.mins, self.maxs, trace_endpos + rigvel_xy * frametime, MOVE_NORMAL, self);
+		tracebox(trace_endpos, self.mins, self.maxs, trace_endpos + rigvel_xy * frametime, mt, self);
 
 		// align to surface
-		tracebox(trace_endpos, self.mins, self.maxs, trace_endpos - up + '0 0 1' * rigvel_z * frametime, MOVE_NORMAL, self);
+		tracebox(trace_endpos, self.mins, self.maxs, trace_endpos - up + '0 0 1' * rigvel_z * frametime, mt, self);
 
 		if(trace_fraction < 0.5)
 		{

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-11-23 11:15:25 UTC (rev 5083)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-11-23 11:29:46 UTC (rev 5084)
@@ -918,6 +918,7 @@
 
 float g_bugrigs;
 float g_bugrigs_planar_movement;
+float g_bugrigs_planar_movement_car_jumping;
 float g_bugrigs_reverse_spinning;
 float g_bugrigs_reverse_speeding;
 float g_bugrigs_reverse_stopping;
@@ -935,6 +936,7 @@
 {
  	g_bugrigs = cvar("g_bugrigs");
  	g_bugrigs_planar_movement = cvar("g_bugrigs_planar_movement");
+ 	g_bugrigs_planar_movement_car_jumping = cvar("g_bugrigs_planar_movement_car_jumping");
  	g_bugrigs_reverse_spinning = cvar("g_bugrigs_reverse_spinning");
  	g_bugrigs_reverse_speeding = cvar("g_bugrigs_reverse_speeding");
  	g_bugrigs_reverse_stopping = cvar("g_bugrigs_reverse_stopping");