X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_seeker.qc;h=08b1a678269e3b88c8aa1a106a108f35c7aee022;hb=3dbc0b5b9ab0f255ec91b8670aeb7cd62218f873;hp=3b23c211294895996cfd5ca80567b4f5b1fc271d;hpb=122e8d0e383558cb4aa730b1d441b141c3d962ae;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 3b23c2112..08b1a6782 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -212,6 +212,8 @@ void Seeker_Fire_Missile(vector f_diff) missile.angles = vectoangles (missile.velocity); CSQCProjectile(missile, FALSE, PROJECTILE_SEEKER, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } void Seeker_Vollycontroler_Think() @@ -351,6 +353,8 @@ void Seeker_Fire_Tag() missile.angles = vectoangles (missile.velocity); CSQCProjectile(missile, TRUE, PROJECTILE_TAG, FALSE); // has sound + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } @@ -424,6 +428,8 @@ void Seeker_Fire_Flac() missile.flags = FL_PROJECTILE; CSQCProjectile(missile, TRUE, PROJECTILE_FLAC, TRUE); + + other = missile; MUTATOR_CALLHOOK(EditProjectile); } void spawnfunc_weapon_seeker (void) @@ -468,15 +474,6 @@ float w_seeker(float req) return self.ammo_rockets >= cvar("g_balance_seeker_tag_ammo") + cvar("g_balance_seeker_missile_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_rockets >= cvar("g_balance_seeker_flac_ammo"); - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "played with tiny rockets"; - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "ran into #'s flac"; - else - w_deathtypestring = "was tagged by"; - } return TRUE; }; #endif @@ -548,6 +545,15 @@ float w_seeker(float req) precache_sound("weapons/tagexp3.wav"); precache_sound("weapons/tag_impact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "%s played with tiny rockets"; + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + w_deathtypestring = "%s ran into %s's flac"; + else + w_deathtypestring = "%s was tagged by %s"; + } return TRUE; } #endif