X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hagar.qc;h=587c9fccc04b4a2de5528d23aa394f63dda06ec0;hb=d561f76342a7e8060a5a1aae4bab3f2bf56c17aa;hp=c95a90e5dae9d78cf135fc143ea3c69b1f75cebe;hpb=a598006dd0a4de3772e7f3a9dc791576c957bc0e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index c95a90e5d..587c9fccc 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -71,6 +71,8 @@ void W_Hagar_Attack (void) missile.flags = FL_PROJECTILE; CSQCProjectile(missile, TRUE, PROJECTILE_HAGAR, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } void W_Hagar_Attack2 (void) @@ -106,6 +108,8 @@ void W_Hagar_Attack2 (void) missile.flags = FL_PROJECTILE; CSQCProjectile(missile, TRUE, PROJECTILE_HAGAR_BOUNCING, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } void spawnfunc_weapon_hagar (void) @@ -151,15 +155,6 @@ float w_hagar(float req) return self.ammo_rockets >= cvar("g_balance_hagar_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_rockets >= cvar("g_balance_hagar_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "played with tiny rockets"; - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH - w_deathtypestring = "hoped #'s missiles wouldn't bounce"; - else // unchecked: SPLASH, SECONDARY - w_deathtypestring = "was pummeled by"; - } return TRUE; }; #endif @@ -187,6 +182,15 @@ float w_hagar(float req) precache_sound("weapons/hagexp2.wav"); precache_sound("weapons/hagexp3.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "%s played with tiny rockets"; + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH + w_deathtypestring = "%s hoped %s's missiles wouldn't bounce"; + else // unchecked: SPLASH, SECONDARY + w_deathtypestring = "%s was pummeled by %s"; + } return TRUE; } #endif