From e8dce877750be7375eff53237e64577f45f6f7b9 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 20 Feb 2009 12:59:34 +0000
Subject: [PATCH] angles "un-holding" fixed

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5910 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/Main.qc    | 2 ++
 data/qcsrc/client/View.qc    | 6 +++---
 data/qcsrc/server/w_porto.qc | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index c07e5f669..fa134adb0 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -661,6 +661,8 @@ void Ent_ClientData()
 		angles_held_y = ReadAngle();
 		angles_held_z = 0;
 	}
+	else
+		angles_held_status = 0;
 	
 	if(newspectatee_status != spectatee_status)
 	{
diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 4ae122ec6..88c070d54 100644
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -2,6 +2,8 @@ entity porto;
 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 @@ void Porto_Draw()
 	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 @@ void CheckForGamestartChange() {
 	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();
diff --git a/data/qcsrc/server/w_porto.qc b/data/qcsrc/server/w_porto.qc
index a008a2bab..3e84d2063 100644
--- a/data/qcsrc/server/w_porto.qc
+++ b/data/qcsrc/server/w_porto.qc
@@ -216,7 +216,6 @@ float w_porto(float req)
 		{
 			if(!self.BUTTON_ATCK2)
 			{
-				msg_entity = self;
 				self.porto_v_angle_held = 0;
 
 				ClientData_Touch(self);
@@ -227,7 +226,6 @@ float w_porto(float req)
 			if(self.BUTTON_ATCK2)
 			{
 				self.porto_v_angle = self.v_angle;
-				msg_entity = self;
 				self.porto_v_angle_held = 1;
 
 				ClientData_Touch(self);
-- 
2.39.2