X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_fireball.qc;h=e78bb2bbc3b1c03ace99f72afcf8f9b280b8430c;hp=368faecbf3b9c340fb945a673102e20e31ba2f97;hb=bb5812761e62c72ffcb95af04778b7b7b65e15fc;hpb=cd65914fa1f967a8300174edc6bc72bfe69154d4

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 368faecbf..e78bb2bbc 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -155,6 +155,8 @@ void W_Fireball_Attack1()
 	proj.flags = FL_PROJECTILE;
 
 	CSQCProjectile(proj, TRUE, PROJECTILE_FIREBALL, TRUE);
+
+	other = proj; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void W_Fireball_AttackEffect(float i, vector f_diff)
@@ -289,6 +291,8 @@ void W_Fireball_Attack2()
 	proj.flags = FL_PROJECTILE;
 
 	CSQCProjectile(proj, TRUE, PROJECTILE_FIREMINE, TRUE);
+
+	other = proj; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void spawnfunc_weapon_fireball (void)
@@ -323,13 +327,13 @@ float w_fireball(float req)
 	{
 		if (self.BUTTON_ATCK)
 		if (time >= self.fireball_primarytime)
-		if (weapon_prepareattack(1, cvar("g_balance_fireball_primary_refire")))
+		if (weapon_prepareattack(0, cvar("g_balance_fireball_primary_refire")))
 		{
 			W_Fireball_Attack1_Frame0();
 			self.fireball_primarytime = time + cvar("g_balance_fireball_primary_refire2");
 		}
 		if (self.BUTTON_ATCK2)
-		if (weapon_prepareattack(0, cvar("g_balance_fireball_secondary_refire")))
+		if (weapon_prepareattack(1, cvar("g_balance_fireball_secondary_refire")))
 		{
 			W_Fireball_Attack2();
 			weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_fireball_secondary_animtime"), w_ready);
@@ -378,7 +382,6 @@ float w_fireball(float req)
 	}
 	else if(req == WR_PRECACHE)
 	{
-		precache_sound("weapons/fireball_impact.wav");
 		precache_sound("weapons/fireball_impact2.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)