Merge branch 'divVerent/ballistic2' into samual/weapons

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

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index a142aa4d07269210d8b3a874b0f7dd1cbc90b957..c00d678ecf1a60ccc23552d57a0868e18294f6c4 100644 (file)
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -17,11 +17,10 @@ REGISTER_WEAPON(
        w_cvar(id, sn, BOTH, animtime) \
        w_cvar(id, sn, BOTH, refire) \
        w_cvar(id, sn, PRI,  bullets) \
-       w_cvar(id, sn, PRI,  bulletconstant) \
        w_cvar(id, sn, BOTH, damage) \
        w_cvar(id, sn, BOTH, force) \
+       w_cvar(id, sn, PRI,  solidpenetration) \
        w_cvar(id, sn, PRI,  spread) \
-       w_cvar(id, sn, PRI,  speed) \
        w_cvar(id, sn, NONE, secondary) \
        w_cvar(id, sn, SEC,  melee_time) \
        w_cvar(id, sn, SEC,  melee_no_doubleslap) \
@@ -55,8 +54,7 @@ void W_Shotgun_Attack (void)
 
        W_SetupShot (self, TRUE, 5, "weapons/shotgun_fire.wav", CH_WEAPON_A, WEP_CVAR_PRI(shotgun, damage) * WEP_CVAR_PRI(shotgun, bullets));
        for (sc = 0;sc < WEP_CVAR_PRI(shotgun, bullets);sc = sc + 1)
-               fireBallisticBullet(w_shotorg, w_shotdir, WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, speed), 5, WEP_CVAR_PRI(shotgun, damage), WEP_CVAR_PRI(shotgun, force), WEP_SHOTGUN, 0, WEP_CVAR_PRI(shotgun, bulletconstant));
-       endFireBallisticBullet();
+               fireBullet(w_shotorg, w_shotdir, WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, damage), WEP_CVAR_PRI(shotgun, force), WEP_SHOTGUN, 0);
 
        pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, WEP_CVAR_PRI(shotgun, ammo));