Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_rifle.qc

diff --git a/qcsrc/server/w_rifle.qc b/qcsrc/server/w_rifle.qc
index 0a50a41929a28172d3907a2da189ce12b3510d53..1c5f766d7dbf2240ce03ee0bce3e149db4c48489 100644 (file)
--- a/qcsrc/server/w_rifle.qc
+++ b/qcsrc/server/w_rifle.qc
@@ -39,7 +39,6 @@ void W_Rifle_Attack2()
        W_Rifle_FireBullet(autocvar_g_balance_rifle_secondary_spread, autocvar_g_balance_rifle_secondary_damage, autocvar_g_balance_rifle_secondary_headshotaddeddamage, autocvar_g_balance_rifle_secondary_force, autocvar_g_balance_rifle_secondary_speed, autocvar_g_balance_rifle_secondary_lifetime, autocvar_g_balance_rifle_secondary_ammo, WEP_RIFLE | HITTYPE_SECONDARY, autocvar_g_balance_rifle_secondary_bulletconstant, autocvar_g_balance_rifle_secondary_tracer, autocvar_g_balance_rifle_secondary_shots, "weapons/campingrifle_fire2.wav");
 }
 
-/*
 void spawnfunc_weapon_rifle (void)
 {
        weapon_defaultspawnfunc(WEP_RIFLE);
@@ -54,7 +53,6 @@ void spawnfunc_weapon_sniperrifle (void)
 {
        spawnfunc_weapon_rifle();
 }
-*/
 
 .void(void) rifle_bullethail_attackfunc;
 .float rifle_bullethail_frame;