X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhook.qc;h=8b2ffca19cdb6e9997edddd5f6c566d93a7b104a;hp=e2fd94434ef7bd1bd7794980e6f4ac0e885b7e34;hb=d6e1aa437e7eb8e182053cf17231597e79df0f81;hpb=dccfc3eef40ca210167d43bb30fae6bb116e12f0

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index e2fd94434e..8b2ffca19c 100644
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -80,7 +80,7 @@ void Draw_GrapplingHook()
 			break;
 	}
 
-	if((self.owner.sv_entnum == player_localentnum - 1))
+	if((self.owner.sv_entnum == player_localentnum - 1) && autocvar_chase_active <= 0)
 	{
 		switch(self.HookType)
 		{
@@ -124,30 +124,13 @@ void Draw_GrapplingHook()
 		case ENT_CLIENT_HOOK:
 			intensity = 1;
 			offset = 0;
-			if(t == NUM_TEAM_1)
+			switch(t)
 			{
-				tex = "particles/hook_red";
-				rgb = '1 .3 .3';
-			}
-			else if(t == NUM_TEAM_2)
-			{
-				tex = "particles/hook_blue";
-				rgb = '.3 .3 1';
-			}
-			else if(t == NUM_TEAM_3)
-			{
-				tex = "particles/hook_yellow";
-				rgb = '1 1 .3';
-			}
-			else if(t == NUM_TEAM_4)
-			{
-				tex = "particles/hook_pink";
-				rgb = '1 .3 1';
-			}
-			else
-			{
-				tex = "particles/hook_green";
-				rgb = '.3 1 .3';
+				case NUM_TEAM_1: tex = "particles/hook_red"; rgb = '1 0.3 0.3'; break;
+				case NUM_TEAM_2: tex = "particles/hook_blue"; rgb = '0.3 0.3 1'; break;
+				case NUM_TEAM_3: tex = "particles/hook_yellow"; rgb = '1 1 0.3'; break;
+				case NUM_TEAM_4: tex = "particles/hook_pink"; rgb = '1 0.3 1'; break;
+				default: tex = "particles/hook_white"; rgb = getcsqcplayercolor(self.sv_entnum); break;
 			}
 			break;
 		case ENT_CLIENT_ARC_BEAM: // todo
@@ -217,7 +200,9 @@ void Ent_ReadHook(float bIsNew, float type)
 
 	if(sf & 1)
 	{
-		self.owner = playerslots[ReadByte() - 1];
+		float myowner = ReadByte();
+		self.owner = playerslots[myowner - 1];
+		self.sv_entnum = myowner;
 		switch(self.HookType)
 		{
 			default: