X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Felectro.qh;h=c7ad6e95106c07af6ff74155133dfdde3cd7562c;hp=4018e5926c78ac03364173ce19883119b59d1503;hb=237d6375e9e1d5913fc8c8e42c54acc275ef211b;hpb=7aaff08fbaad9424651ec31c82f8a5d78e5ec1e1

diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh
index 4018e5926..c7ad6e951 100644
--- a/qcsrc/common/weapons/weapon/electro.qh
+++ b/qcsrc/common/weapons/weapon/electro.qh
@@ -2,7 +2,7 @@
 
 CLASS(Electro, Weapon)
 /* spawnfunc */ ATTRIB(Electro, m_canonical_spawnfunc, string, "weapon_electro");
-/* ammotype  */ ATTRIB(Electro, ammo_type, int, RESOURCE_CELLS);
+/* ammotype  */ ATTRIB(Electro, ammo_type, int, RES_CELLS);
 /* impulse   */ ATTRIB(Electro, impulse, int, 5);
 /* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000);
@@ -40,9 +40,12 @@ CLASS(Electro, Weapon)
 		P(class, prefix, force, float, BOTH) \
 		P(class, prefix, health, float, SEC) \
 		P(class, prefix, lifetime, float, BOTH) \
+		P(class, prefix, midaircombo_enemy, bool, PRI) \
 		P(class, prefix, midaircombo_explode, float, PRI) \
 		P(class, prefix, midaircombo_interval, float, PRI) \
+		P(class, prefix, midaircombo_own, bool, PRI) \
 		P(class, prefix, midaircombo_radius, float, PRI) \
+		P(class, prefix, midaircombo_teammate, float, PRI) \
 		P(class, prefix, radius, float, BOTH) \
 		P(class, prefix, refire2, float, SEC) \
 		P(class, prefix, refire, float, BOTH) \