Merge branch 'samual/menu_updates' of git://de.git.xonotic.org/xonotic/xonotic-data...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_hook.qc

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index d3c38fc0543717b331bc3c07ce790f12bf703691..695ac381fe55afcaeb750f2890e313addb6ef915 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -56,9 +56,11 @@ void W_Hook_Damage (entity inflictor, entity attacker, float damage, float death
 {
        if (self.health <= 0)
                return;
-       self.health = self.health - damage;
+               
+       if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
+               return; // g_projectiles_damage says to halt    
        
-       print(strcat("hookbomb health ", ftos(self.health), " after ", ftos(damage), " damage... (at time: ", ftos(time), ")\n"));
+       self.health = self.health - damage;
        
        if (self.health <= 0)
                W_PrepareExplosionByDamage(self.realowner, W_Hook_Explode2);
@@ -72,7 +74,7 @@ void W_Hook_Touch2 (void)
 
 void W_Hook_Attack2()
 {
-       local entity gren;
+       entity gren;
 
        W_DecreaseAmmo(ammo_cells, autocvar_g_balance_hook_secondary_ammo, FALSE);
        W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CH_WEAPON_A, autocvar_g_balance_hook_secondary_damage);
@@ -263,7 +265,7 @@ float w_hook(float req)
                self.hook_refire = time;
        }
        return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_hook(float req)
@@ -283,7 +285,7 @@ float w_hook(float req)
        else if (req == WR_SUICIDEMESSAGE)
                w_deathtypestring = _("%s did the impossible");
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = _("%s has run into %s's gravity bomb");
+               w_deathtypestring = _("%s was caught in %s's hook gravity bomb");
        return TRUE;
 }
 #endif