Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

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

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index c95a90e5dae9d78cf135fc143ea3c69b1f75cebe..587c9fccc04b4a2de5528d23aa394f63dda06ec0 100644 (file)
--- 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