X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=370f2fb9878041cea1bac0cd540d82d2c450a231;hb=5f5505ba20abda2ac0d8eec592d6082846a49b19;hp=dfd68e2ecc4efc4ff92dc8b1ea2e9c2fef78e9b5;hpb=f8b86e2d48479e07daf1d1831eec8ae3f9f7c485;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index dfd68e2ec..370f2fb98 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -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;
@@ -271,28 +271,29 @@ void GrapplingHookTouch (void)
 
 void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
-	if(self.health > 0)
-	{
-		self.health = self.health - damage;
+	if(self.health <= 0)
+		return;
 		
-		print(strcat("hook health ", ftos(self.health), " after ", ftos(damage), " damage... (at time: ", ftos(time), ")\n"));
+	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
+		return; // g_balance_projectiledamage says to halt
+			
+	self.health = self.health - damage;
 		
-		if (self.health <= 0)
+	if (self.health <= 0)
+	{
+		if(attacker != self.realowner)
 		{
-			if(attacker != self.realowner)
-			{
-				self.realowner.pusher = attacker;
-				self.realowner.pushltime = time + autocvar_g_maxpushtime;
-			}
-			RemoveGrapplingHook(self.realowner);
+			self.realowner.pusher = attacker;
+			self.realowner.pushltime = time + autocvar_g_maxpushtime;
 		}
+		RemoveGrapplingHook(self.realowner);
 	}
 }
 
 void FireGrapplingHook (void)
 {
-	local entity missile;
-	local vector org;
+	entity missile;
+	vector org;
 	float s;
 	vector vs;
 
@@ -327,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);
@@ -380,7 +382,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)