Nasty fix for drag cheat

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

diff --git a/qcsrc/common/weapons/w_rpc.qc b/qcsrc/common/weapons/w_rpc.qc
index 87ad16f5c67e90545c1b8e2cfecb35dc75fb6ed6..8a34490e28c0760b91f07994c7dcde7907fb823a 100644 (file)
--- a/qcsrc/common/weapons/w_rpc.qc
+++ b/qcsrc/common/weapons/w_rpc.qc
@@ -108,8 +108,8 @@ void W_RocketPropelledChainsaw_Attack (void)
        entity flash = spawn ();
 
        W_DecreaseAmmo(WEP_CVAR(rpc, ammo));
-       W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', false, 5, "weapons/rocket_fire.wav", CH_WEAPON_A, WEP_CVAR(rpc, damage));
-       Send_Effect("rocketlauncher_muzzleflash", w_shotorg, w_shotdir * 1000, 1);
+       W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', false, 5, W_Sound("rocket_fire"), CH_WEAPON_A, WEP_CVAR(rpc, damage));
+       Send_Effect(EFFECT_ROCKET_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1);
        PROJECTILE_MAKETRIGGER(missile);
 
        missile.owner = missile.realowner = self;
@@ -183,10 +183,10 @@ bool W_RocketPropelledChainsaw(int req)
                case WR_INIT:
                {
                        precache_model ("models/flash.md3");
-                       precache_model("models/weapons/h_ok_rl.iqm");
-                       precache_model("models/weapons/v_ok_rl.md3");
-                       precache_model("models/weapons/g_ok_rl.md3");
-                       precache_sound ("weapons/rocket_fire.wav");
+                       precache_model(W_Model("g_ok_rl.md3"));
+                       precache_model(W_Model("v_ok_rl.md3"));
+                       precache_model(W_Model("h_ok_rl.iqm"));
+                       precache_sound (W_Sound("rocket_fire"));
                        RPC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
@@ -207,7 +207,7 @@ bool W_RocketPropelledChainsaw(int req)
                }
                case WR_RELOAD:
                {
-                       W_Reload(WEP_CVAR(rpc, ammo), "weapons/reload.wav");
+                       W_Reload(WEP_CVAR(rpc, ammo), W_Sound("reload"));
                        return true;
                }
                case WR_SUICIDEMESSAGE:
@@ -241,15 +241,15 @@ bool W_RocketPropelledChainsaw(int req)
                {
                        vector org2;
                        org2 = w_org + w_backoff * 12;
-                       pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
+                       pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), org2, '0 0 0', 1);
                        if(!w_issilent)
-                               sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
+                               sound(self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
 
                        return true;
                }
                case WR_INIT:
                {
-                       precache_sound("weapons/rocket_impact.wav");
+                       precache_sound(W_Sound("rocket_impact"));
                        return true;
                }
                case WR_ZOOMRETICLE: