X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhook.qc;h=609a06bbca46ce9e3c95bb7914a1693e826111f7;hb=f4803dbafcdd9f29092535640728e3de19a987da;hp=06858d597aa917a126e1e46cc50354458973afa0;hpb=b9bf009c922e99a114516a129298e7d6df66f535;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 06858d597..609a06bbc 100644
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -1,11 +1,10 @@
 .float HookType; // ENT_CLIENT_*
 .vector origin;
 .vector velocity;
-.float HookSound;
 .float HookSilent;
 .float HookRange;
 
-void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float alpha, float drawflag, vector vieworg)
+void Draw_CylindricLine(vector from, vector to, float thickness, string texture, float aspect, float shift, vector rgb, float theAlpha, float drawflag, vector vieworg)
 {
 	// I want to draw a quad...
 	// from and to are MIDPOINTS.
@@ -19,23 +18,16 @@ void Draw_CylindricLine(vector from, vector to, float thickness, string texture,
 	// direction is perpendicular to the view normal, and perpendicular to the axis
 	thickdir = normalize(cross(axis, vieworg - from));
 
-/*
-	print("from ", vtos(from), "\n");
-	print("to ", vtos(to), "\n");
-	print("org ", vtos(view_origin), "\n");
-	print("dir ", vtos(thickdir), "\n");
-*/
-
 	A = from - thickdir * (thickness / 2);
 	B = from + thickdir * (thickness / 2);
 	C = to + thickdir * (thickness / 2);
 	D = to - thickdir * (thickness / 2);
 
 	R_BeginPolygon(texture, drawflag);
-	R_PolygonVertex(A, '0 0 0' + shift * '1 0 0', rgb, alpha);
-	R_PolygonVertex(B, '0 1 0' + shift * '1 0 0', rgb, alpha);
-	R_PolygonVertex(C, '0 1 0' + (shift + length_tex) * '1 0 0', rgb, alpha);
-	R_PolygonVertex(D, '0 0 0' + (shift + length_tex) * '1 0 0', rgb, alpha);
+	R_PolygonVertex(A, '0 0 0' + shift * '1 0 0', rgb, theAlpha);
+	R_PolygonVertex(B, '0 1 0' + shift * '1 0 0', rgb, theAlpha);
+	R_PolygonVertex(C, '0 1 0' + (shift + length_tex) * '1 0 0', rgb, theAlpha);
+	R_PolygonVertex(D, '0 0 0' + (shift + length_tex) * '1 0 0', rgb, theAlpha);
 	R_EndPolygon();
 }
 
@@ -53,19 +45,27 @@ void Draw_GrapplingHook_trace_callback(vector start, vector hit, vector end)
 	Draw_GrapplingHook_trace_callback_rnd += 0.25 * vlen(hit - start) / 8;
 }
 
+.float teleport_time;
 void Draw_GrapplingHook()
 {
 	vector a, b, atrans;
-	string tex, snd;
+	string tex;
 	vector rgb;
 	float t;
 	float s;
 	vector vs;
 	float intensity, offset;
 
+	if(self.teleport_time)
+	if(time > self.teleport_time)
+	{
+		sound (self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTN_NORM); // safeguard
+		self.teleport_time = 0;
+	}
+
 	InterpolateOrigin_Do();
 
-	s = cvar("cl_gunalign");
+	s = autocvar_cl_gunalign;
 	if(s != 1 && s != 2 && s != 4)
 		s = 3; // default value
 	--s;
@@ -129,22 +129,22 @@ void Draw_GrapplingHook()
 		case ENT_CLIENT_HOOK:
 			intensity = 1;
 			offset = 0;
-			if(t == COLOR_TEAM1)
+			if(t == FL_TEAM_1)
 			{
 				tex = "particles/hook_red";
 				rgb = '1 .3 .3';
 			}
-			else if(t == COLOR_TEAM2)
+			else if(t == FL_TEAM_2)
 			{
 				tex = "particles/hook_blue";
 				rgb = '.3 .3 1';
 			}
-			else if(t == COLOR_TEAM3)
+			else if(t == FL_TEAM_3)
 			{
 				tex = "particles/hook_yellow";
 				rgb = '1 1 .3';
 			}
-			else if(t == COLOR_TEAM4)
+			else if(t == FL_TEAM_4)
 			{
 				tex = "particles/hook_pink";
 				rgb = '1 .3 1';
@@ -182,8 +182,16 @@ void Draw_GrapplingHook()
 	{
 		default:
 		case ENT_CLIENT_HOOK:
-			setorigin(self, trace_endpos); // hook endpoint!
-			self.angles = vectoangles(trace_endpos - atrans);
+			if(vlen(trace_endpos - atrans) > 0.5)
+			{
+				setorigin(self, trace_endpos); // hook endpoint!
+				self.angles = vectoangles(trace_endpos - atrans);
+				self.drawmask = MASK_NORMAL;
+			}
+			else
+			{
+				self.drawmask = 0;
+			}
 			break;
 		case ENT_CLIENT_LGBEAM:
 		case ENT_CLIENT_GAUNTLET:
@@ -207,7 +215,7 @@ void Draw_GrapplingHook()
 
 void Remove_GrapplingHook()
 {
-	sound (self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
+	sound (self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTN_NORM);
 }
 
 void Ent_ReadHook(float bIsNew, float type)
@@ -253,7 +261,7 @@ void Ent_ReadHook(float bIsNew, float type)
 
 	InterpolateOrigin_Note();
 
-	if(bIsNew)
+	if(bIsNew || !self.teleport_time)
 	{
 		self.draw = Draw_GrapplingHook;
 		self.entremove = Remove_GrapplingHook;
@@ -267,13 +275,15 @@ void Ent_ReadHook(float bIsNew, float type)
 				self.drawmask = MASK_NORMAL;
 				break;
 			case ENT_CLIENT_LGBEAM:
-				sound (self, CHAN_PROJECTILE, "weapons/lgbeam_fly.wav", VOL_BASE, ATTN_NORM);
+				sound (self, CH_SHOTS_SINGLE, "weapons/lgbeam_fly.wav", VOL_BASE, ATTN_NORM);
 				break;
 			case ENT_CLIENT_GAUNTLET:
-				sound (self, CHAN_PROJECTILE, "weapons/gauntletbeam_fly.wav", VOL_BASE, ATTN_NORM);
+				sound (self, CH_SHOTS_SINGLE, "weapons/gauntletbeam_fly.wav", VOL_BASE, ATTN_NORM);
 				break;
 		}
 	}
+
+	self.teleport_time = time + 10;
 }
 
 void Hook_Precache()