r5910 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-20 07:59:34 -0500 (Fri, 20 Feb 2009)
New Revision: 5910

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/server/w_porto.qc
Log:
angles "un-holding" fixed


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-02-20 10:10:37 UTC (rev 5909)
+++ trunk/data/qcsrc/client/Main.qc	2009-02-20 12:59:34 UTC (rev 5910)
@@ -661,6 +661,8 @@
 		angles_held_y = ReadAngle();
 		angles_held_z = 0;
 	}
+	else
+		angles_held_status = 0;
 	
 	if(newspectatee_status != spectatee_status)
 	{

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-02-20 10:10:37 UTC (rev 5909)
+++ trunk/data/qcsrc/client/View.qc	2009-02-20 12:59:34 UTC (rev 5910)
@@ -2,6 +2,8 @@
 vector polyline[16];
 float trace_dphitcontents;
 float Q3SURFACEFLAG_SLICK = 2; // low friction surface
+float DPCONTENTS_SOLID = 1; // blocks player movement
+float DPCONTENTS_BODY = 32; // blocks player movement
 float DPCONTENTS_PLAYERCLIP = 256; // blocks player movement
 void Porto_Draw()
 {
@@ -29,7 +31,7 @@
 	for(;;)
 	{
 		dir = nextdir;
-		traceline(p, p + 65536 * dir, TRUE, world);
+		traceline(p, p + 65536 * dir, TRUE, porto);
 		if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
 			return;
 		nextdir = dir - 2 * (dir * trace_plane_normal) * trace_plane_normal; // mirror dir at trace_plane_normal
@@ -94,8 +96,6 @@
 	previous_game_starttime = startTime;
 }
 
-float DPCONTENTS_SOLID = 1; // hit a bmodel, not a bounding box
-float DPCONTENTS_BODY = 32; // hit a bounding box, not a bmodel
 void Porto_Init()
 {
 	porto = spawn();

Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc	2009-02-20 10:10:37 UTC (rev 5909)
+++ trunk/data/qcsrc/server/w_porto.qc	2009-02-20 12:59:34 UTC (rev 5910)
@@ -216,7 +216,6 @@
 		{
 			if(!self.BUTTON_ATCK2)
 			{
-				msg_entity = self;
 				self.porto_v_angle_held = 0;
 
 				ClientData_Touch(self);
@@ -227,7 +226,6 @@
 			if(self.BUTTON_ATCK2)
 			{
 				self.porto_v_angle = self.v_angle;
-				msg_entity = self;
 				self.porto_v_angle_held = 1;
 
 				ClientData_Touch(self);