take3: format 903 files

[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..77081a02488b236b64530c8fc4ef48b6da8c2c30 100644 (file)
--- a/qcsrc/common/items/item/jetpack.qh
+++ b/qcsrc/common/items/item/jetpack.qh
@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef SVQC
-    #include <common/t_items.qh>
+#include <common/t_items.qh>
 #endif
 
 #include "ammo.qh"
@@ -15,19 +15,31 @@
 MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3"));
 #endif
 
-REGISTER_ITEM(Jetpack, Powerup) {
+#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;
+       this.m_model                =   MDL_Jetpack_ITEM;
+       this.m_itemid               =   IT_JETPACK;
 #endif
-    this.m_name                 =   "Jet pack";
-    this.m_icon                 =   "jetpack";
-    this.m_color                =   '0.5 0.5 0.5';
-    this.m_waypoint             =   _("Jet Pack");
-    this.m_waypointblink        =   2;
+       this.netname                =   "jetpack";
+       this.m_name                 =   "Jet pack";
+       this.m_icon                 =   "jetpack";
+       this.m_color                =   '0.5 0.5 0.5';
+       this.m_waypoint             =   _("Jet Pack");
+       this.m_waypointblink        =   2;
 #ifdef SVQC
-    this.m_botvalue             =   3000;
-    this.m_pickupevalfunc       =   ammo_pickupevalfunc;
+       this.m_botvalue             =   3000;
+       this.m_pickupevalfunc       =   ammo_pickupevalfunc;
+       this.m_iteminit             =   powerup_jetpack_init;
 #endif
 }
 
@@ -35,15 +47,27 @@ REGISTER_ITEM(Jetpack, Powerup) {
 MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3"));
 #endif
 
-REGISTER_ITEM(JetpackFuel, Ammo) {
+#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;
+       this.m_model    =   MDL_JetpackFuel_ITEM;
 #endif
-    this.m_name     =   "Fuel";
-    this.m_icon     =   "ammo_fuel";
+       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_botvalue =   2000;
+       this.m_itemid   =   IT_FUEL;
+       this.m_iteminit =   ammo_fuel_init;
 #endif
 }
 
@@ -51,18 +75,20 @@ REGISTER_ITEM(JetpackFuel, Ammo) {
 MODEL(JetpackRegen_ITEM, Item_Model("g_fuelregen.md3"));
 #endif
 
-REGISTER_ITEM(JetpackRegen, Powerup) {
+REGISTER_ITEM(JetpackRegen, Powerup)
+{
 #ifdef GAMEQC
-    this.m_model                =   MDL_JetpackRegen_ITEM;
+       this.m_model                =   MDL_JetpackRegen_ITEM;
 #endif
-    this.m_name                 =   "Fuel regenerator";
-    this.m_icon                 =   "fuelregen";
-    this.m_color                =   '1 0.5 0';
-    this.m_waypoint             =   _("Fuel regen");
-    this.m_waypointblink        =   2;
+       this.netname                =   "fuel_regen";
+       this.m_name                 =   "Fuel regenerator";
+       this.m_icon                 =   "fuelregen";
+       this.m_color                =   '1 0.5 0';
+       this.m_waypoint             =   _("Fuel regen");
+       this.m_waypointblink        =   2;
 #ifdef SVQC
-    this.m_botvalue             =   3000;
-    this.m_itemid               =   IT_FUEL_REGEN;
-    this.m_pickupevalfunc       =   ammo_pickupevalfunc;
+       this.m_botvalue             =   3000;
+       this.m_itemid               =   IT_FUEL_REGEN;
+       this.m_pickupevalfunc       =   ammo_pickupevalfunc;
 #endif
 }