From: Martin Taibr Date: Fri, 2 Aug 2019 07:12:19 +0000 (+0200) Subject: s/burst_speed/burst_spread - seems to be a typo X-Git-Tag: xonotic-v0.8.5~1432^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F669%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git s/burst_speed/burst_spread - seems to be a typo --- diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index 45a75349b..c838e0058 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -71,7 +71,7 @@ set g_balance_machinegun_burst_ammo 3 set g_balance_machinegun_burst_animtime 0.3 set g_balance_machinegun_burst_refire 0.06 set g_balance_machinegun_burst_refire2 0.45 -set g_balance_machinegun_burst_speed 0 +set g_balance_machinegun_burst_spread 0 set g_balance_machinegun_first 1 set g_balance_machinegun_first_ammo 1 set g_balance_machinegun_first_damage 14 diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg index b1a83000f..a27427305 100644 --- a/bal-wep-nexuiz25.cfg +++ b/bal-wep-nexuiz25.cfg @@ -71,7 +71,7 @@ set g_balance_machinegun_burst_ammo 3 set g_balance_machinegun_burst_animtime 0.75 set g_balance_machinegun_burst_refire 0.05 set g_balance_machinegun_burst_refire2 0.75 -set g_balance_machinegun_burst_speed 0 +set g_balance_machinegun_burst_spread 0 set g_balance_machinegun_first 1 set g_balance_machinegun_first_ammo 1 set g_balance_machinegun_first_damage 30 diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg index 1816f3f2e..4a5827d2b 100644 --- a/bal-wep-samual.cfg +++ b/bal-wep-samual.cfg @@ -86,7 +86,7 @@ set g_balance_machinegun_burst_ammo 3 set g_balance_machinegun_burst_animtime 0.3 set g_balance_machinegun_burst_refire 0.06 set g_balance_machinegun_burst_refire2 0.45 -set g_balance_machinegun_burst_speed 0 +set g_balance_machinegun_burst_spread 0 set g_balance_machinegun_first 1 set g_balance_machinegun_first_ammo 1 set g_balance_machinegun_first_damage 14 diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg index 13bdc529a..a9592ac1f 100644 --- a/bal-wep-xdf.cfg +++ b/bal-wep-xdf.cfg @@ -71,7 +71,7 @@ set g_balance_machinegun_burst_ammo 3 set g_balance_machinegun_burst_animtime 0.3 set g_balance_machinegun_burst_refire 0.06 set g_balance_machinegun_burst_refire2 0.45 -set g_balance_machinegun_burst_speed 0 +set g_balance_machinegun_burst_spread 0 set g_balance_machinegun_first 1 set g_balance_machinegun_first_ammo 1 set g_balance_machinegun_first_damage 14 diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index 5c6ace7ab..c730ebc1e 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -71,7 +71,7 @@ set g_balance_machinegun_burst_ammo 3 set g_balance_machinegun_burst_animtime 0.3 set g_balance_machinegun_burst_refire 0.06 set g_balance_machinegun_burst_refire2 0.45 -set g_balance_machinegun_burst_speed 0 +set g_balance_machinegun_burst_spread 0 set g_balance_machinegun_first 1 set g_balance_machinegun_first_ammo 1 set g_balance_machinegun_first_damage 14 diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg index a5438d1b7..6dea1ed6e 100644 --- a/bal-wep-xpm.cfg +++ b/bal-wep-xpm.cfg @@ -71,7 +71,7 @@ set g_balance_machinegun_burst_ammo 3 set g_balance_machinegun_burst_animtime 0.3 set g_balance_machinegun_burst_refire 0.06 set g_balance_machinegun_burst_refire2 0.45 -set g_balance_machinegun_burst_speed 0 +set g_balance_machinegun_burst_spread 0 set g_balance_machinegun_first 1 set g_balance_machinegun_first_ammo 1 set g_balance_machinegun_first_damage 14 diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index 6679f2135..2d88a9deb 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -164,7 +164,7 @@ void W_MachineGun_Attack_Burst(Weapon thiswep, entity actor, .entity weaponentit actor.punchangle_y = random() - 0.5; } - fireBullet(actor, weaponentity, w_shotorg, w_shotdir, WEP_CVAR(machinegun, burst_speed), WEP_CVAR(machinegun, solidpenetration), WEP_CVAR(machinegun, sustained_damage), WEP_CVAR(machinegun, sustained_force), thiswep.m_id, EFFECT_BULLET); + fireBullet(actor, weaponentity, w_shotorg, w_shotdir, WEP_CVAR(machinegun, burst_spread), WEP_CVAR(machinegun, solidpenetration), WEP_CVAR(machinegun, sustained_damage), WEP_CVAR(machinegun, sustained_force), thiswep.m_id, EFFECT_BULLET); Send_Effect(EFFECT_MACHINEGUN_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1); diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index a53d17a8d..19bba63a2 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -24,7 +24,7 @@ CLASS(MachineGun, Weapon) P(class, prefix, burst_animtime, float, NONE) \ P(class, prefix, burst_refire2, float, NONE) \ P(class, prefix, burst_refire, float, NONE) \ - P(class, prefix, burst_speed, float, NONE) \ + P(class, prefix, burst_spread, float, NONE) \ P(class, prefix, first, float, NONE) \ P(class, prefix, first_ammo, float, NONE) \ P(class, prefix, first_damage, float, NONE) \