X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=86fb14b29c997be7a56166fd57958a43b274c59f;hb=89059db88d23602bdf51d6f9d049c4eb7fe9d308;hp=54cca3e95da7810c57b3a4990ba67db3d15160dd;hpb=2487070c23bdcfc8ac60d414356ec43f52ec1a57;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 54cca3e95..86fb14b29 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -8,6 +8,8 @@
 #include "cl_player.qh"
 #include "command/common.qh"
 #include "round_handler.qh"
+#include "../common/state.qh"
+#include "../common/physics/player.qh"
 #include "../common/vehicles/all.qh"
 #include "../common/constants.qh"
 #include "../common/util.qh"
@@ -240,7 +242,7 @@ void GrapplingHookThink()
 					{
 						entity aim_ent = ((IS_VEHICLE(self.aiment) && self.aiment.owner) ? self.aiment.owner : self.aiment);
 						v = v - dv * 0.5;
-						if((frozen_pulling && self.aiment.frozen) || !frozen_pulling)
+						if((frozen_pulling && STAT(FROZEN, self.aiment)) || !frozen_pulling)
 						{
 							self.aiment.velocity = self.aiment.velocity - dv * 0.5;
 							UNSET_ONGROUND(self.aiment);
@@ -251,7 +253,7 @@ void GrapplingHookThink()
 							self.aiment.nextthink = time + autocvar_g_balance_grapplehook_nade_time; // set time after letting go?
 						aim_ent.pusher = self.realowner;
 						aim_ent.pushltime = time + autocvar_g_maxpushtime;
-						aim_ent.istypefrag = aim_ent.BUTTON_CHAT;
+						aim_ent.istypefrag = PHYS_INPUT_BUTTON_CHAT(aim_ent);
 					}
 				}
 
@@ -261,7 +263,7 @@ void GrapplingHookThink()
 			if(!frozen_pulling && !(self.aiment.flags & FL_PROJECTILE))
 				pull_entity.velocity = WarpZone_RefSys_TransformVelocity(self, pull_entity, v * velocity_multiplier);
 
-			if(frozen_pulling && autocvar_g_balance_grapplehook_pull_frozen == 2 && !self.aiment.frozen)
+			if(frozen_pulling && autocvar_g_balance_grapplehook_pull_frozen == 2 && !STAT(FROZEN, self.aiment))
 			{
 				RemoveGrapplingHook(self.realowner);
 				return;
@@ -317,25 +319,25 @@ void GrapplingHookTouch ()
 	//self.realowner.disableclientprediction = true;
 }
 
-void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{SELFPARAM();
-	if(self.health <= 0)
+void GrapplingHook_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+{
+	if(this.health <= 0)
 		return;
 
-	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
+	if (!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions
 		return; // g_balance_projectiledamage says to halt
 
-	self.health = self.health - damage;
+	this.health = this.health - damage;
 
-	if (self.health <= 0)
+	if (this.health <= 0)
 	{
-		if(attacker != self.realowner)
+		if(attacker != this.realowner)
 		{
-			self.realowner.pusher = attacker;
-			self.realowner.pushltime = time + autocvar_g_maxpushtime;
-			self.realowner.istypefrag = self.realowner.BUTTON_CHAT;
+			this.realowner.pusher = attacker;
+			this.realowner.pushltime = time + autocvar_g_maxpushtime;
+			this.realowner.istypefrag = PHYS_INPUT_BUTTON_CHAT(this.realowner);
 		}
-		RemoveGrapplingHook(self.realowner);
+		RemoveGrapplingHook(this.realowner);
 	}
 }