X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem%2Fjetpack.qh;h=760033861a7db8377342bc6ff7dbd6bef1901b4b;hp=73f55e83f5a225a82605e5320f3de8291bf26c03;hb=69eda62d02bc02ff50547bad514af3f7ce487413;hpb=16bb4a51347c40ae0655bba054bc7cf201538e45 diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh index 73f55e83f..760033861 100644 --- a/qcsrc/common/items/item/jetpack.qh +++ b/qcsrc/common/items/item/jetpack.qh @@ -19,8 +19,8 @@ MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3")); PROPERTY(int, g_pickup_fuel_jetpack); void powerup_jetpack_init(Pickup this, entity item) { - if(!item.ammo_fuel) - item.ammo_fuel = g_pickup_fuel_jetpack; + if(!GetResourceAmount(item, RESOURCE_FUEL)) + SetResourceAmountExplicit(item, RESOURCE_FUEL, g_pickup_fuel_jetpack); } #endif @@ -35,10 +35,10 @@ REGISTER_ITEM(Jetpack, Powerup) { this.m_itemid = IT_JETPACK; #endif this.netname = "jetpack"; - this.m_name = "Jet pack"; + this.m_name = "Jetpack"; this.m_icon = "jetpack"; this.m_color = '0.5 0.5 0.5'; - this.m_waypoint = _("Jet Pack"); + this.m_waypoint = _("Jetpack"); this.m_waypointblink = 2; #ifdef SVQC this.m_botvalue = 3000; @@ -57,14 +57,14 @@ MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3")); PROPERTY(int, g_pickup_fuel); void ammo_fuel_init(Pickup this, entity item) { - if(!item.ammo_fuel) - item.ammo_fuel = g_pickup_fuel; + if(!GetResourceAmount(item, RESOURCE_FUEL)) + SetResourceAmountExplicit(item, RESOURCE_FUEL, g_pickup_fuel); } #endif REGISTER_ITEM(JetpackFuel, Ammo) { this.m_canonical_spawnfunc = "item_fuel"; #ifdef GAMEQC - this.spawnflags = ITEM_FLAG_NORMAL; + this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE; this.m_model = MDL_JetpackFuel_ITEM; #endif this.netname = "fuel";