Merge branch 'master' into martin-t/damagetext

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / jetpack.qh

diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh
index 5093234fbe9ec3de67402133c5b90fdffd965342..a6d1c8dae89751694d03d16bc6f35238eceec0c5 100644 (file)
--- a/qcsrc/common/items/item/jetpack.qh
+++ b/qcsrc/common/items/item/jetpack.qh
@@ -15,11 +15,20 @@
 MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3"));
 #endif
 
+#ifdef SVQC
+PROPERTY(int, g_pickup_fuel_jetpack);
+void powerup_jetpack_init(entity item)
+{
+    if(!item.ammo_fuel)
+        item.ammo_fuel = g_pickup_fuel_jetpack;
+}
+#endif
 REGISTER_ITEM(Jetpack, Powerup) {
 #ifdef GAMEQC
     this.m_model                =   MDL_Jetpack_ITEM;
     this.m_itemid               =   IT_JETPACK;
 #endif
+    this.netname                =   "jetpack";
     this.m_name                 =   "Jet pack";
     this.m_icon                 =   "jetpack";
     this.m_color                =   '0.5 0.5 0.5';
@@ -28,6 +37,7 @@ REGISTER_ITEM(Jetpack, Powerup) {
 #ifdef SVQC
     this.m_botvalue             =   3000;
     this.m_pickupevalfunc       =   ammo_pickupevalfunc;
+    this.m_iteminit             =   powerup_jetpack_init;
 #endif
 }
 
@@ -35,15 +45,25 @@ REGISTER_ITEM(Jetpack, Powerup) {
 MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3"));
 #endif
 
+#ifdef SVQC
+PROPERTY(int, g_pickup_fuel);
+void ammo_fuel_init(entity item)
+{
+    if(!item.ammo_fuel)
+        item.ammo_fuel = g_pickup_fuel;
+}
+#endif
 REGISTER_ITEM(JetpackFuel, Ammo) {
 #ifdef GAMEQC
     this.m_model    =   MDL_JetpackFuel_ITEM;
 #endif
+    this.netname    =   "fuel";
     this.m_name     =   "Fuel";
     this.m_icon     =   "ammo_fuel";
 #ifdef SVQC
     this.m_botvalue =   2000;
     this.m_itemid   =   IT_FUEL;
+    this.m_iteminit =   ammo_fuel_init;
 #endif
 }
 
@@ -55,6 +75,7 @@ REGISTER_ITEM(JetpackRegen, Powerup) {
 #ifdef GAMEQC
     this.m_model                =   MDL_JetpackRegen_ITEM;
 #endif
+    this.netname                =   "fuel_regen";
     this.m_name                 =   "Fuel regenerator";
     this.m_icon                 =   "fuelregen";
     this.m_color                =   '1 0.5 0';