X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hook.qc;h=334e434c8afa9526774aab288d2ad2dfcbfa6dd5;hb=baf37238c9698513cf4f67ebbd790d41a82aea88;hp=9e5868355991106d4b48cd6feae4171c2903802d;hpb=99cb391b8d83f0efdb2c9aeb7ccc50683dfd0b55;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc index 9e5868355..334e434c8 100644 --- a/qcsrc/server/w_hook.qc +++ b/qcsrc/server/w_hook.qc @@ -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) @@ -239,10 +241,6 @@ float w_hook(float req) { return self.ammo_cells >= cvar("g_balance_hook_secondary_ammo"); } - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - w_deathtypestring = "has run into #'s gravity bomb"; else if (req == WR_RESETPLAYER) { self.hook_refire = time; @@ -265,6 +263,10 @@ float w_hook(float req) { precache_sound("weapons/hookbomb_impact.wav"); } + 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"; return TRUE; } #endif