X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hook.qc;h=5b1cf61350a1421b379f2a5f52846bc253e3365b;hb=a0f8261f12a1a8b073066e06622834cad1a06c65;hp=c8d1369f7b42b11363f032163ec8b95eb306dc81;hpb=a9e41298d7a296528d3ab8aff39826c761f1ae89;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc index c8d1369f7..5b1cf6135 100644 --- a/qcsrc/server/w_hook.qc +++ b/qcsrc/server/w_hook.qc @@ -64,7 +64,7 @@ void W_Hook_Attack2() if not(self.items & IT_UNLIMITED_WEAPON_AMMO) self.ammo_cells = self.ammo_cells - cvar("g_balance_hook_secondary_ammo"); - W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", cvar("g_balance_hook_secondary_damage")); + W_SetupShot (self, FALSE, 4, "weapons/hookbomb_fire.wav", CHAN_WEAPON, cvar("g_balance_hook_secondary_damage")); gren = spawn (); gren.owner = self; @@ -93,6 +93,8 @@ void W_Hook_Attack2() gren.flags = FL_PROJECTILE; CSQCProjectile(gren, TRUE, PROJECTILE_HOOKBOMB, TRUE); + + other = gren; MUTATOR_CALLHOOK(EditProjectile); } void spawnfunc_weapon_hook (void) @@ -262,9 +264,9 @@ float w_hook(float req) precache_sound("weapons/hookbomb_impact.wav"); } else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; + w_deathtypestring = "%s did the impossible"; else if (req == WR_KILLMESSAGE) - w_deathtypestring = "has run into #'s gravity bomb"; + w_deathtypestring = "%s has run into %s's gravity bomb"; return TRUE; } #endif