Merge branch 'master' into TimePath/universal_weapons

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

diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index a011846315b81c4ecbc75633e351e59591b29fb9..410dd246be37c084718e9ece0b5dbf3f8b6c6c3b 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -392,7 +392,7 @@ void W_Devastator_Attack(void)
        MUTATOR_CALLHOOK(EditProjectile, self, missile);
 }
 
-bool W_Devastator(int req)
+bool W_Devastator(entity thiswep, int req)
 {SELFPARAM();
        entity rock;
        float rockfound;
@@ -530,7 +530,7 @@ bool W_Devastator(int req)
                case WR_THINK:
                {
                        if(WEP_CVAR(devastator, reload_ammo) && self.clip_load < WEP_CVAR(devastator, ammo)) // forced reload
-                               WEP_ACTION(self.weapon, WR_RELOAD);
+                               _WEP_ACTION(self.weapon, WR_RELOAD);
                        else
                        {
                                if(self.BUTTON_ATCK)
@@ -646,7 +646,7 @@ bool W_Devastator(int req)
 }
 #endif
 #ifdef CSQC
-bool W_Devastator(int req)
+bool W_Devastator(entity thiswep, int req)
 {SELFPARAM();
        switch(req)
        {