Merge branch 'maint' (early part before Transifex)

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

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index ee4878fd4b059c5d7d45d55339e950ca22d7bea7..0825103d478cba33beafb529c78243f770a6ba60 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -9,7 +9,7 @@ REGISTER_WEAPON(
 /* color     */ '1 0.5 1',
 /* modelname */ "crylink",
 /* simplemdl */ "foobar",
-/* crosshair */ "gfx/crosshaircrylink 0.4",
+/* crosshair */ "gfx/crosshaircrylink 0.5",
 /* wepimg    */ "weaponcrylink",
 /* refname   */ "crylink",
 /* wepname   */ _("Crylink")
@@ -437,7 +437,7 @@ void W_Crylink_Attack(void)
 
                CSQCProjectile(proj, true, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), true);
 
-               other = proj; MUTATOR_CALLHOOK(EditProjectile);
+               MUTATOR_CALLHOOK(EditProjectile, self, proj);
        }
        if(WEP_CVAR_PRI(crylink, joinspread) != 0)
        {
@@ -553,7 +553,7 @@ void W_Crylink_Attack2(void)
 
                CSQCProjectile(proj, true, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), true);
 
-               other = proj; MUTATOR_CALLHOOK(EditProjectile);
+               MUTATOR_CALLHOOK(EditProjectile, self, proj);
        }
        if(WEP_CVAR_SEC(crylink, joinspread) != 0)
        {
@@ -563,7 +563,7 @@ void W_Crylink_Attack2(void)
        }
 }
 
-float W_Crylink(float req)
+bool W_Crylink(int req)
 {
        float ammo_amount;
        switch(req)
@@ -689,7 +689,7 @@ float W_Crylink(float req)
 }
 #endif
 #ifdef CSQC
-float W_Crylink(float req)
+bool W_Crylink(int req)
 {
        switch(req)
        {