X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=b08ef098609732a67a18effdfd6e094d7f1f4a3e;hb=1f5b5365f75a317384ad9176e9064809a1eb31e1;hp=30c3ca54beef26820378f959dfb232b4658af096;hpb=1e926ffdd1dc18bdde7a189a54938ac205d39260;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 30c3ca54b..b08ef0986 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -116,9 +116,9 @@ void GrapplingHookThink()
 {
 	float spd, dist, minlength, pullspeed, ropestretch, ropeairfriction, rubberforce, newlength, rubberforce_overstretch, s;
 	vector dir, org, end, v0, dv, v, myorg, vs;
-	if(self.realowner.health <= 0 || self.realowner.hook != self)	// how did that happen?
-	{														// well, better fix it anyway
-		remove(self);
+	if(self.realowner.hook != self)	// how did that happen?
+	{
+		error("Owner lost the hook!\n");
 		return;
 	}
 	if(LostMovetypeFollow(self))
@@ -279,8 +279,6 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, floa
 			
 	self.health = self.health - damage;
 		
-	print(strcat("hook health ", ftos(self.health), " after ", ftos(damage), " damage... (at time: ", ftos(time), ")\n"));
-		
 	if (self.health <= 0)
 	{
 		if(attacker != self.realowner)
@@ -294,8 +292,8 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, floa
 
 void FireGrapplingHook (void)
 {
-	local entity missile;
-	local vector org;
+	entity missile;
+	vector org;
 	float s;
 	vector vs;
 
@@ -330,6 +328,7 @@ void FireGrapplingHook (void)
 	self.hook = missile;
 	missile.reset = GrapplingHookReset;
 	missile.classname = "grapplinghook";
+	missile.flags = FL_PROJECTILE;
 
 	missile.movetype = MOVETYPE_FLY;
 	PROJECTILE_MAKETRIGGER(missile);