X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fmachinegun.qh;h=19bba63a2bb1241e62107e6b9fbb313ea91f1f70;hb=ebec51e2a451b28980fcd246eb002b6d0c6bae8a;hp=a7ede47a2105125d60a9a07778130c633720ce8e;hpb=9e113dae328809b5e7432f434649a35ebb185a52;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index a7ede47a2..19bba63a2 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -2,9 +2,9 @@ CLASS(MachineGun, Weapon) /* spawnfunc */ ATTRIB(MachineGun, m_canonical_spawnfunc, string, "weapon_machinegun"); -/* ammotype */ ATTRIB(MachineGun, ammo_type, int, RESOURCE_BULLETS); +/* ammotype */ ATTRIB(MachineGun, ammo_type, int, RES_BULLETS); /* impulse */ ATTRIB(MachineGun, impulse, int, 3); -/* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); +/* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_BLEED); /* rating */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000); /* color */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0'); /* modelname */ ATTRIB(MachineGun, mdl, string, "uzi"); @@ -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) \