Deprecate weapon_func

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

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 3aa17e526d566f02734a72dd2d9cb7cbb753a35a..898fedf220a78fbfbe7689ebd22812a196acbdec 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -77,7 +77,7 @@ void SendCSQCVortexBeamParticle(float charge) {
 }
 
 void W_Vortex_Attack(float issecondary)
-{
+{SELFPARAM();
        float mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, myammo, charge;
 
        mydmg = WEP_CVAR_BOTH(vortex, !issecondary, damage);
@@ -132,8 +132,8 @@ void W_Vortex_Attack(float issecondary)
 void spawnfunc_weapon_vortex(void); // defined in t_items.qc
 
 .float vortex_chargepool_pauseregen_finished;
-bool W_Vortex(int req)
-{
+bool W_Vortex(entity thiswep, int req)
+{SELFPARAM();
        float dt;
        float ammo_amount;
        switch(req)
@@ -163,7 +163,7 @@ bool W_Vortex(int req)
                                }
 
                        if(autocvar_g_balance_vortex_reload_ammo && self.clip_load < min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo))) // forced reload
-                               WEP_ACTION(self.weapon, WR_RELOAD);
+                               _WEP_ACTION(self.weapon, WR_RELOAD);
                        else
                        {
                                if(self.BUTTON_ATCK)
@@ -253,10 +253,6 @@ bool W_Vortex(int req)
                }
                case WR_INIT:
                {
-                       precache_model("models/nexflash.md3");
-                       precache_model(W_Model("g_nex.md3"));
-                       precache_model(W_Model("v_nex.md3"));
-                       precache_model(W_Model("h_nex.iqm"));
                        precache_sound(W_Sound("nexfire"));
                        precache_sound(W_Sound("nexcharge"));
                        precache_sound(W_Sound("nexwhoosh1"));
@@ -319,8 +315,8 @@ bool W_Vortex(int req)
 #endif
 #ifdef CSQC
 float autocvar_g_balance_vortex_secondary = 0; // WEAPONTODO
-bool W_Vortex(int req)
-{
+bool W_Vortex(entity thiswep, int req)
+{SELFPARAM();
        switch(req)
        {
                case WR_IMPACTEFFECT: