Merge branch 'terencehill/obsolete_cvars_removal' into 'master'

[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..2e515137c59ab5ff64eacf07775c3b4465469f0d 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);
@@ -133,7 +133,7 @@ void spawnfunc_weapon_vortex(void); // defined in t_items.qc
 
 .float vortex_chargepool_pauseregen_finished;
 bool W_Vortex(int req)
-{
+{SELFPARAM();
        float dt;
        float ammo_amount;
        switch(req)
@@ -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"));
@@ -320,7 +316,7 @@ bool W_Vortex(int req)
 #ifdef CSQC
 float autocvar_g_balance_vortex_secondary = 0; // WEAPONTODO
 bool W_Vortex(int req)
-{
+{SELFPARAM();
        switch(req)
        {
                case WR_IMPACTEFFECT: