Merge branch 'Mario/weapon_alias_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / arc.qh

diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh
index ec15d8db7e09eba29e991575c54d057aa5ba36b7..15a2cb772f15b8dde905e6cd6c5d65197d566576 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qh
+++ b/qcsrc/common/weapons/weapon/arc.qh
@@ -2,7 +2,7 @@
 
 CLASS(Arc, Weapon)
 /* spawnfunc */ ATTRIB(Arc, m_canonical_spawnfunc, string, "weapon_arc");
-/* ammotype  */ ATTRIB(Arc, ammo_type, int, RES_CELLS);
+/* ammotype  */ ATTRIB(Arc, ammo_type, Resource, RES_CELLS);
 /* impulse   */ ATTRIB(Arc, impulse, int, 3);
 /* flags     */ ATTRIB(Arc, spawnflags, int, WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000);
@@ -24,7 +24,7 @@ CLASS(Arc, Weapon)
                P(class, prefix, bolt, float, NONE) \
                P(class, prefix, bolt_ammo, float, NONE) \
         P(class, prefix, bolt_bounce_count, float, NONE) \
-        P(class, prefix, bolt_bounce_damage, float, NONE) \
+        P(class, prefix, bolt_bounce_explode, float, NONE) \
         P(class, prefix, bolt_bounce_lifetime, float, NONE) \
         P(class, prefix, bolt_count, float, NONE) \
         P(class, prefix, bolt_damageforcescale, float, NONE) \