]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Make hook use FL_PROJECTILE and also change the check in sv_main.qc to use it too.
authorSamual <samual@xonotic.org>
Sat, 1 Oct 2011 16:19:18 +0000 (12:19 -0400)
committerSamual <samual@xonotic.org>
Sat, 1 Oct 2011 16:19:18 +0000 (12:19 -0400)
qcsrc/server/g_hook.qc
qcsrc/server/sv_main.qc

index 30c3ca54beef26820378f959dfb232b4658af096..13efb17b7f6b20dc3ff5d646e9ebe12fea62bbd7 100644 (file)
@@ -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);
index 8c38c3bc9675a0eef9f28c01567abddd9c06cc64..4dfbca2f490851b318fed40c47fccb00a47e9ea3 100644 (file)
@@ -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)
                {