X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fhook.qc;h=5bc00c1506a4e202fe4891d12e1aeac021c34fc1;hb=bf1d64ebc5c2867b079a0bfa09f448f076d6be01;hp=51e5803704b779e63fb9ab7d2eb670dd5f2e1618;hpb=873f1b3ef177d3b290982be4adb3707482b8c6fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/hook.qc b/qcsrc/server/hook.qc
index 51e580370..5bc00c150 100644
--- a/qcsrc/server/hook.qc
+++ b/qcsrc/server/hook.qc
@@ -161,7 +161,9 @@ void GrapplingHookThink(entity this)
 		error("Owner lost the hook!\n");
 		return;
 	}
-	if(LostMovetypeFollow(this) || game_stopped || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || ((this.aiment.flags & FL_PROJECTILE) && this.aiment.classname != "nade"))
+	if((this.move_movetype == MOVETYPE_FOLLOW && LostMovetypeFollow(this))
+		|| game_stopped || (round_handler_IsActive() && !round_handler_IsRoundStarted())
+		|| ((this.aiment.flags & FL_PROJECTILE) && this.aiment.classname != "nade"))
 	{
 		RemoveHook(this);
 		return;
@@ -368,7 +370,7 @@ void FireGrapplingHook(entity actor, .entity weaponentity)
 	vector vs = hook_shotorigin[s];
 	vector oldmovedir = actor.(weaponentity).movedir;
 	actor.(weaponentity).movedir = vs;
-	W_SetupShot_ProjectileSize(actor, weaponentity, '-3 -3 -3', '3 3 3', true, 0, SND_HOOK_FIRE, CH_WEAPON_B, 0, WEP_HOOK.m_id);
+	W_SetupShot_ProjectileSize(actor, weaponentity, HOOK_MINS, HOOK_MAXS, true, 0, SND_HOOK_FIRE, CH_WEAPON_B, 0, WEP_HOOK.m_id);
 	W_MuzzleFlash(WEP_HOOK, actor, weaponentity, w_shotorg, '0 0 0');
 	actor.(weaponentity).movedir = oldmovedir;
 
@@ -386,7 +388,7 @@ void FireGrapplingHook(entity actor, .entity weaponentity)
 	PROJECTILE_MAKETRIGGER(missile);
 
 	//setmodel (missile, MDL_HOOK); // precision set below
-	setsize (missile, '-3 -3 -3', '3 3 3');
+	setsize (missile, HOOK_MINS, HOOK_MAXS);
 	setorigin(missile, w_shotorg);
 
 	missile.state = 0; // not latched onto anything