X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=f7af47d924036f121a6b8340a8dc2df5a0edaee4;hb=b0e4ebf4cf698adc8d6322fb366d0e6045d555e6;hp=5561c2df93ffa1bfea9b27361feab4f51c7507ca;hpb=e53a561cca4d6780e8df8451a674ca92fb867c81;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 5561c2df9..f7af47d92 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -79,7 +79,7 @@ void GrapplingHook_Stop()
 	self.state = 1;
 	self.think = GrapplingHookThink;
 	self.nextthink = time;
-	self.touch = SUB_Null;
+	self.touch = func_null;
 	self.velocity = '0 0 0';
 	self.movetype = MOVETYPE_NONE;
 	self.hook_length = -1;
@@ -116,12 +116,12 @@ 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))
+	if(LostMovetypeFollow(self) || intermission_running)
 	{
 		RemoveGrapplingHook(self.realowner);
 		return;
@@ -213,6 +213,7 @@ void GrapplingHookThink()
 						self.aiment.flags &~= FL_ONGROUND;
 						self.aiment.pusher = self.realowner;
 						self.aiment.pushltime = time + autocvar_g_maxpushtime;
+						self.aiment.istypefrag = self.aiment.BUTTON_CHAT;
 					}
 				}
 
@@ -285,6 +286,7 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, floa
 		{
 			self.realowner.pusher = attacker;
 			self.realowner.pushltime = time + autocvar_g_maxpushtime;
+			self.realowner.istypefrag = self.realowner.BUTTON_CHAT;
 		}
 		RemoveGrapplingHook(self.realowner);
 	}
@@ -292,8 +294,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;
 
@@ -382,7 +384,7 @@ void FireGrapplingHook (void)
 
 void GrapplingHookFrame()
 {
-	if(g_grappling_hook && timeoutStatus != 2 && self.weapon != WEP_HOOK)
+	if(g_grappling_hook && timeout_status != TIMEOUT_ACTIVE && self.weapon != WEP_HOOK)
 	{
 		// offhand hook controls
 		if(self.BUTTON_HOOK)