Merge branch 'TimePath/mutator_cleanup' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_fireball.qc

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index d0980091353b01615c9475f8ec9fd1caa1ee0736..112b6524eade596d0601257b7507cd508a4ca006 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -161,7 +161,7 @@ void W_Fireball_Think(void)
        self.nextthink = time + 0.1;
 }
 
-void W_Fireball_Damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void W_Fireball_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if(self.health <= 0)
                return;
@@ -213,7 +213,7 @@ void W_Fireball_Attack1(void)
 
        CSQCProjectile(proj, true, PROJECTILE_FIREBALL, true);
 
-       other = proj; MUTATOR_CALLHOOK(EditProjectile);
+       MUTATOR_CALLHOOK(EditProjectile, self, proj);
 }
 
 void W_Fireball_AttackEffect(float i, vector f_diff)
@@ -344,10 +344,10 @@ void W_Fireball_Attack2(void)
 
        CSQCProjectile(proj, true, PROJECTILE_FIREMINE, true);
 
-       other = proj; MUTATOR_CALLHOOK(EditProjectile);
+       MUTATOR_CALLHOOK(EditProjectile, self, proj);
 }
 
-float W_Fireball(float req)
+bool W_Fireball(int req)
 {
        switch(req)
        {
@@ -447,7 +447,7 @@ float W_Fireball(float req)
 }
 #endif
 #ifdef CSQC
-float W_Fireball(float req)
+bool W_Fireball(int req)
 {
        switch(req)
        {