Merge branch 'master' into martin-t/bullet-trails

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

diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc
index 3b4cfbc141c9a6b1798612f7b8ef7238162f20eb..11b9d924309d32e5e666c38827ae841dce043ae3 100644 (file)
--- a/qcsrc/common/items/item/jetpack.qc
+++ b/qcsrc/common/items/item/jetpack.qc
@@ -1,48 +1,23 @@
-#ifdef SVQC
-    #include "../../../server/t_items.qh"
-    #include "../../../server/constants.qh"
-#endif
-
-#include "ammo.qh"
-#include "powerup.qh"
+#include "jetpack.qh"
 
-REGISTER_ITEM(Jetpack, Powerup) {
-    this.m_model                =   "g_jetpack.md3";
-    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             =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid               =   IT_JETPACK;
-    this.m_pickupevalfunc       =   commodity_pickupevalfunc;
-#endif
+
+METHOD(Jetpack, m_spawnfunc_hookreplace, GameItem(Jetpack this, entity e))
+{
+       if(start_items & ITEM_Jetpack.m_itemid)
+       {
+               return ITEM_JetpackFuel;
+       }
+       return this;
 }
 
-REGISTER_ITEM(JetpackFuel, Ammo) {
-    this.m_model    =   "g_fuel.md3";
-    this.m_name     =   "Fuel";
-    this.m_icon     =   "ammo_fuel";
-#ifdef SVQC
-    this.m_botvalue =   BOT_PICKUP_RATING_LOW;
-    this.m_itemid   =   IT_FUEL;
-#endif
+METHOD(JetpackRegen, m_spawnfunc_hookreplace, GameItem(JetpackRegen this, entity e))
+{
+       if (start_items & ITEM_JetpackRegen.m_itemid)
+       {
+               return ITEM_JetpackFuel;
+       }
+       return this;
 }
 
-REGISTER_ITEM(JetpackRegen, Pickup) {
-    this.m_model                =   "g_fuelregen.md3";
-    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             =   BOT_PICKUP_RATING_LOW;
-    this.m_itemflags            =   FL_POWERUP;
-    this.m_itemid               =   IT_FUEL_REGEN;
-    this.m_pickupevalfunc       =   commodity_pickupevalfunc;
-    this.m_respawntime          =   GET(g_pickup_respawntime_powerup);
-    this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_powerup);
 #endif
-}