X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fg_hook.qc;h=fd3cd08ecfe70d9864117218e9ad2e6dddec0c26;hb=3034dc93a6b1893a471a3da1f5aa96c9f2492b6d;hp=b22a81e0427d6145fa238a11cc385fb3f2eab1ce;hpb=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index b22a81e04..fd3cd08ec 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -301,18 +301,18 @@ void GrapplingHookThink(entity this)
 	}
 }
 
-void GrapplingHookTouch (entity this)
+void GrapplingHookTouch(entity this, entity toucher)
 {
-	if(other.movetype == MOVETYPE_FOLLOW)
+	if(toucher.movetype == MOVETYPE_FOLLOW)
 		return;
-	PROJECTILE_TOUCH(this);
+	PROJECTILE_TOUCH(this, toucher);
 
 	GrapplingHook_Stop(this);
 
-	if(other)
-		if(other.movetype != MOVETYPE_NONE)
+	if(toucher)
+		if(toucher.movetype != MOVETYPE_NONE)
 		{
-			SetMovetypeFollow(this, other);
+			SetMovetypeFollow(this, toucher);
 			WarpZone_RefSys_BeginAddingIncrementally(this, this.aiment);
 		}