From: Samual <samual@xonotic.org>
Date: Sat, 1 Oct 2011 16:19:18 +0000 (-0400)
Subject: Make hook use FL_PROJECTILE and also change the check in sv_main.qc to use it too.
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d3d37d9eae53a896db2c38552919ca3ed9c31c85;p=xonotic%2Fxonotic-data.pk3dir.git

Make hook use FL_PROJECTILE and also change the check in sv_main.qc to use it too.
---

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 30c3ca54b..13efb17b7 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -330,6 +330,7 @@ void FireGrapplingHook (void)
 	self.hook = missile;
 	missile.reset = GrapplingHookReset;
 	missile.classname = "grapplinghook";
+	missile.flags = FL_PROJECTILE;
 
 	missile.movetype = MOVETYPE_FLY;
 	PROJECTILE_MAKETRIGGER(missile);
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 8c38c3bc9..4dfbca2f4 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -12,7 +12,7 @@ void CreatureFrame (void)
 		if (self.movetype == MOVETYPE_NOCLIP) { continue; }
 		
 		float vehic = (self.vehicle_flags & VHF_ISVEHICLE);
-		float projectile = ((self.projectiledeathtype) || (self.classname == "grapplinghook"));
+		float projectile = (self.flags & FL_PROJECTILE);
 		
 		if (self.watertype <= CONTENT_WATER && self.waterlevel > 0) // workaround a retarded bug made by id software :P (yes, it's that old of a bug)
 		{