]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/t_items.qc
Merge branch 'master' into TimePath/items
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc
index cb76f97f9a9a730cd9f750a3889a68d388ead5e4..832290f845633cffa8b7d999d65adf2a82c42620 100644 (file)
@@ -272,7 +272,8 @@ bool ItemSend(entity this, entity to, int sf)
 
        if(sf & ISF_SIZE)
        {
-               WriteByte(MSG_ENTITY, ((self.flags & FL_POWERUP) || self.health || self.armorvalue));
+               Pickup p = this.itemdef;
+               WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor);
        }
 
        if(sf & ISF_STATUS)
@@ -308,9 +309,9 @@ void ItemUpdate(entity item)
        item.SendFlags |= ISF_LOCATION;
 }
 
-float have_pickup_item(void)
-{SELFPARAM();
-       if(self.flags & FL_POWERUP)
+bool have_pickup_item(entity this)
+{
+       if(this.itemdef.instanceOfPowerup)
        {
                if(autocvar_g_powerups > 0)
                        return true;
@@ -324,7 +325,7 @@ float have_pickup_item(void)
                if(autocvar_g_pickup_items == 0)
                        return false;
                if(g_weaponarena)
-                       if(self.weapons || (self.items & IT_AMMO)) // no item or ammo pickups in weaponarena
+                       if(this.weapons || (this.items & IT_AMMO)) // no item or ammo pickups in weaponarena
                                return false;
        }
        return true;
@@ -377,7 +378,12 @@ void Item_Show (entity e, float mode)
                e.spawnshieldtime = 1;
                e.ItemStatus &= ~ITS_AVAILABLE;
        }
-       else if((e.flags & FL_WEAPON) && !(e.flags & FL_NO_WEAPON_STAY) && g_weapon_stay)
+       else {
+       entity def = e.itemdef;
+       bool nostay = def.instanceOfWeaponPickup ? !!(def.m_weapon.weapons & WEPSET_SUPERWEAPONS) : false // no weapon-stay on superweapons
+               || e.team // weapon stay isn't supported for teamed weapons
+               ;
+       if(def.instanceOfWeaponPickup && !nostay && g_weapon_stay)
        {
                // make the item translucent and not touchable
                e.model = e.mdl;
@@ -394,7 +400,7 @@ void Item_Show (entity e, float mode)
                e.glowmod = e.colormod;
                e.spawnshieldtime = 1;
                e.ItemStatus &= ~ITS_AVAILABLE;
-       }
+       }}
 
        if (e.items & ITEM_Strength.m_itemid || e.items & ITEM_Shield.m_itemid)
                e.ItemStatus |= ITS_POWERUP;
@@ -639,7 +645,7 @@ float Item_GiveTo(entity item, entity player)
        pickedup |= Item_GiveAmmoTo(item, player, health, item.max_health, ITEM_MODE_HEALTH);
        pickedup |= Item_GiveAmmoTo(item, player, armorvalue, item.max_armorvalue, ITEM_MODE_ARMOR);
 
-       if (item.flags & FL_WEAPON)
+       if (item.itemdef.instanceOfWeaponPickup)
        {
                WepSet it;
                it = item.weapons;
@@ -690,7 +696,7 @@ float Item_GiveTo(entity item, entity player)
                return 0;
 
        // crude hack to enforce switching weapons
-       if(g_cts && (item.flags & FL_WEAPON))
+       if(g_cts && item.itemdef.instanceOfWeaponPickup)
        {
                W_SwitchWeapon_Force(player, item.weapon);
                return 1;
@@ -703,16 +709,16 @@ float Item_GiveTo(entity item, entity player)
        return 1;
 }
 
-void Item_Touch (void)
-{SELFPARAM();
-       entity e, head;
+void Item_Touch()
+{
+       SELFPARAM();
 
        // remove the item if it's currnetly in a NODROP brush or hits a NOIMPACT surface (such as sky)
-       if(self.classname == "droppedweapon")
+       if (this.classname == "droppedweapon")
        {
                if (ITEM_TOUCH_NEEDKILL())
                {
-                       remove(self);
+                       remove(this);
                        return;
                }
        }
@@ -720,33 +726,33 @@ void Item_Touch (void)
        if(!(other.flags & FL_PICKUPITEMS)
        || other.frozen
        || other.deadflag
-       || (self.solid != SOLID_TRIGGER)
-       || (self.owner == other)
-       || (time < self.item_spawnshieldtime)
-       ) { return;}
+       || (this.solid != SOLID_TRIGGER)
+       || (this.owner == other)
+       || (time < this.item_spawnshieldtime)
+       ) { return; }
 
-       switch(MUTATOR_CALLHOOK(ItemTouch, self, other))
+       switch (MUTATOR_CALLHOOK(ItemTouch, this, other))
        {
                case MUT_ITEMTOUCH_RETURN: { return; }
                case MUT_ITEMTOUCH_PICKUP: { goto pickup; }
        }
 
-       if (self.classname == "droppedweapon")
+       if (this.classname == "droppedweapon")
        {
-               self.strength_finished = max(0, self.strength_finished - time);
-               self.invincible_finished = max(0, self.invincible_finished - time);
-               self.superweapons_finished = max(0, self.superweapons_finished - time);
+               this.strength_finished = max(0, this.strength_finished - time);
+               this.invincible_finished = max(0, this.invincible_finished - time);
+               this.superweapons_finished = max(0, this.superweapons_finished - time);
        }
-       entity it = self.itemdef;
-       bool gave = (it && it.instanceOfPickup) ? ITEM_HANDLE(Pickup, it, self, other) : Item_GiveTo(self, other);
+       entity it = this.itemdef;
+       bool gave = ITEM_HANDLE(Pickup, it, this, other);
        if (!gave)
        {
-               if (self.classname == "droppedweapon")
+               if (this.classname == "droppedweapon")
                {
                        // undo what we did above
-                       self.strength_finished += time;
-                       self.invincible_finished += time;
-                       self.superweapons_finished += time;
+                       this.strength_finished += time;
+                       this.invincible_finished += time;
+                       this.superweapons_finished += time;
                }
                return;
        }
@@ -755,17 +761,18 @@ void Item_Touch (void)
 
        other.last_pickup = time;
 
-       Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(self), '0 0 0', 1);
-       _sound (other, CH_TRIGGER, (self.item_pickupsound ? self.item_pickupsound : self.item_pickupsound_ent.sound_str()), VOL_BASE, ATTEN_NORM);
+       Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(this), '0 0 0', 1);
+       _sound (other, CH_TRIGGER, (this.item_pickupsound ? this.item_pickupsound : this.item_pickupsound_ent.sound_str()), VOL_BASE, ATTEN_NORM);
 
-       if (self.classname == "droppedweapon")
-               remove (self);
-       else if (self.spawnshieldtime)
+       if (this.classname == "droppedweapon")
+               remove (this);
+       else if (this.spawnshieldtime)
        {
-               if(self.team)
+               entity e;
+               if(this.team)
                {
                        RandomSelection_Init();
-                       for(head = world; (head = findfloat(head, team, self.team)); )
+                       for(entity head = world; (head = findfloat(head, team, this.team)); )
                        {
                                if(head.flags & FL_ITEM)
                                if(head.classname != "item_flag_team" && head.classname != "item_key_team")
@@ -778,28 +785,29 @@ void Item_Touch (void)
 
                }
                else
-                       e = self;
+                       e = this;
                Item_ScheduleRespawn(e);
        }
 }
 
-void Item_Reset()
-{SELFPARAM();
-       Item_Show(self, !self.state);
-       setorigin (self, self.origin);
+void Item_Reset(entity this)
+{
+       Item_Show(this, !this.state);
+       setorigin(this, this.origin);
 
-       if(self.classname != "droppedweapon")
+       if (this.classname != "droppedweapon")
        {
-               self.think = Item_Think;
-               self.nextthink = time;
+               this.think = Item_Think;
+               this.nextthink = time;
 
-               if(self.waypointsprite_attached)
-                       WaypointSprite_Kill(self.waypointsprite_attached);
+               if (this.waypointsprite_attached)
+                       WaypointSprite_Kill(this.waypointsprite_attached);
 
-               if((self.flags & FL_POWERUP) || (self.weapons & WEPSET_SUPERWEAPONS)) // do not spawn powerups initially!
-                       Item_ScheduleInitialRespawn(self);
+               if (this.itemdef.instanceOfPowerup || (this.weapons & WEPSET_SUPERWEAPONS)) // do not spawn powerups initially!
+                       Item_ScheduleInitialRespawn(this);
        }
 }
+void Item_Reset_self() { SELFPARAM(); Item_Reset(this); }
 
 void Item_FindTeam()
 {SELFPARAM();
@@ -831,7 +839,7 @@ void Item_FindTeam()
                        head.effects &= ~EF_NODRAW;
                }
 
-               Item_Reset();
+               Item_Reset(self);
        }
 }
 
@@ -971,238 +979,230 @@ void Item_Damage(entity inflictor, entity attacker, float damage, int deathtype,
                RemoveItem();
 }
 
-void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, float defaultrespawntimejitter, string itemname, float itemid, float weaponid, float itemflags, float(entity player, entity item) pickupevalfunc, float pickupbasevalue)
-{SELFPARAM();
-       startitem_failed = false;
-
-       if(self.model == "")
-               self.model = itemmodel;
+void _StartItem(entity this, entity def, float defaultrespawntime, float defaultrespawntimejitter)
+{
+       string itemname = def.m_name;
+       Model itemmodel = def.m_model;
+    Sound pickupsound = def.m_sound;
+       float(entity player, entity item) pickupevalfunc = def.m_pickupevalfunc;
+       float pickupbasevalue = def.m_botvalue;
+       int itemflags = def.m_itemflags;
 
-       if(self.model == "")
-    {
-        error(strcat("^1Tried to spawn ", itemname, " with no model!\n"));
-        return;
-    }
+       startitem_failed = false;
 
-       if(self.item_pickupsound == "")
-               self.item_pickupsound = pickupsound;
+       this.item_model_ent = itemmodel;
+    this.item_pickupsound_ent = pickupsound;
 
-       if(!self.respawntime) // both need to be set
+       if(!this.respawntime) // both need to be set
        {
-               self.respawntime = defaultrespawntime;
-               self.respawntimejitter = defaultrespawntimejitter;
+               this.respawntime = defaultrespawntime;
+               this.respawntimejitter = defaultrespawntimejitter;
        }
 
-       self.items = itemid;
-       self.weapon = weaponid;
+       int itemid = def.m_itemid;
+       this.items = itemid;
+       int weaponid = def.instanceOfWeaponPickup ? def.m_weapon.m_id : 0;
+       this.weapon = weaponid;
 
-       if(!self.fade_end)
+       if(!this.fade_end)
        {
-               self.fade_start = autocvar_g_items_mindist;
-               self.fade_end = autocvar_g_items_maxdist;
+               this.fade_start = autocvar_g_items_mindist;
+               this.fade_end = autocvar_g_items_maxdist;
        }
 
        if(weaponid)
-               self.weapons = WepSet_FromWeapon(weaponid);
+               this.weapons = WepSet_FromWeapon(weaponid);
 
-       self.flags = FL_ITEM | itemflags;
+       this.flags = FL_ITEM | itemflags;
 
-       if(MUTATOR_CALLHOOK(FilterItem)) // error means we do not want the item
+       if(MUTATOR_CALLHOOK(FilterItem, this)) // error means we do not want the item
        {
                startitem_failed = true;
-               remove(self);
+               remove(this);
                return;
        }
 
        // is it a dropped weapon?
-       if (self.classname == "droppedweapon")
+       if (this.classname == "droppedweapon")
        {
-               self.reset = SUB_Remove;
+               this.reset = SUB_Remove;
                // it's a dropped weapon
-               self.movetype = MOVETYPE_TOSS;
+               this.movetype = MOVETYPE_TOSS;
 
                // Savage: remove thrown items after a certain period of time ("garbage collection")
-               self.think = RemoveItem;
-               self.nextthink = time + 20;
+               this.think = RemoveItem;
+               this.nextthink = time + 20;
 
-               self.takedamage = DAMAGE_YES;
-               self.event_damage = Item_Damage;
+               this.takedamage = DAMAGE_YES;
+               this.event_damage = Item_Damage;
 
-               if(self.strength_finished || self.invincible_finished || self.superweapons_finished)
+               if(this.strength_finished || this.invincible_finished || this.superweapons_finished)
                /*
-               if(self.items == 0)
-               if(!(self.weapons & ~WEPSET_SUPERWEAPONS)) // only superweapons
-               if(self.ammo_nails == 0)
-               if(self.ammo_cells == 0)
-               if(self.ammo_rockets == 0)
-               if(self.ammo_shells == 0)
-               if(self.ammo_fuel == 0)
-               if(self.health == 0)
-               if(self.armorvalue == 0)
+               if(this.items == 0)
+               if(!(this.weapons & ~WEPSET_SUPERWEAPONS)) // only superweapons
+               if(this.ammo_nails == 0)
+               if(this.ammo_cells == 0)
+               if(this.ammo_rockets == 0)
+               if(this.ammo_shells == 0)
+               if(this.ammo_fuel == 0)
+               if(this.health == 0)
+               if(this.armorvalue == 0)
                */
                {
                        // if item is worthless after a timer, have it expire then
-                       self.nextthink = max(self.strength_finished, self.invincible_finished, self.superweapons_finished);
+                       this.nextthink = max(this.strength_finished, this.invincible_finished, this.superweapons_finished);
                }
 
                // don't drop if in a NODROP zone (such as lava)
-               traceline(self.origin, self.origin, MOVE_NORMAL, self);
+               traceline(this.origin, this.origin, MOVE_NORMAL, this);
                if (trace_dpstartcontents & DPCONTENTS_NODROP)
                {
                        startitem_failed = true;
-                       remove(self);
+                       remove(this);
                        return;
                }
        }
        else
        {
-               if(!have_pickup_item())
+               if(!have_pickup_item(this))
                {
                        startitem_failed = true;
-                       remove (self);
+                       remove (this);
                        return;
                }
 
-               if(self.angles != '0 0 0')
-                       self.SendFlags |= ISF_ANGLES;
+               if(this.angles != '0 0 0')
+                       this.SendFlags |= ISF_ANGLES;
 
-               self.reset = Item_Reset;
+               this.reset = Item_Reset_self;
                // it's a level item
-               if(self.spawnflags & 1)
-                       self.noalign = 1;
-               if (self.noalign > 0)
-                       self.movetype = MOVETYPE_NONE;
+               if(this.spawnflags & 1)
+                       this.noalign = 1;
+               if (this.noalign > 0)
+                       this.movetype = MOVETYPE_NONE;
                else
-                       self.movetype = MOVETYPE_TOSS;
+                       this.movetype = MOVETYPE_TOSS;
                // do item filtering according to game mode and other things
-               if (self.noalign <= 0)
+               if (this.noalign <= 0)
                {
                        // first nudge it off the floor a little bit to avoid math errors
-                       setorigin(self, self.origin + '0 0 1');
+                       setorigin(this, this.origin + '0 0 1');
                        // set item size before we spawn a spawnfunc_waypoint
-                       if((itemflags & FL_POWERUP) || self.health || self.armorvalue)
-                               setsize (self, '-16 -16 0', '16 16 48');
-                       else
-                               setsize (self, '-16 -16 0', '16 16 32');
-                       self.SendFlags |= ISF_SIZE;
+                       setsize(this, def.m_mins, def.m_maxs);
+                       this.SendFlags |= ISF_SIZE;
                        // note droptofloor returns false if stuck/or would fall too far
-                       if(!self.noalign)
-                               droptofloor();
-                       waypoint_spawnforitem(self);
+                       if (!this.noalign)
+                               WITH(entity, self, this, droptofloor());
+                       waypoint_spawnforitem(this);
                }
 
                /*
                 * can't do it that way, as it would break maps
                 * TODO make a target_give like entity another way, that perhaps has
                 * the weapon name in a key
-               if(self.targetname)
+               if(this.targetname)
                {
                        // target_give not yet supported; maybe later
-                       print("removed targeted ", self.classname, "\n");
+                       print("removed targeted ", this.classname, "\n");
                        startitem_failed = true;
-                       remove (self);
+                       remove (this);
                        return;
                }
                */
 
                if(autocvar_spawn_debug >= 2)
                {
-                       entity otheritem;
-                       for(otheritem = findradius(self.origin, 3); otheritem; otheritem = otheritem.chain)
+                       for(entity otheritem = findradius(this.origin, 3); otheritem; otheritem = otheritem.chain)
                        {
                            // why not flags & fl_item?
                                if(otheritem.is_item)
                                {
-                                       LOG_TRACE("XXX Found duplicated item: ", itemname, vtos(self.origin));
+                                       LOG_TRACE("XXX Found duplicated item: ", itemname, vtos(this.origin));
                                        LOG_TRACE(" vs ", otheritem.netname, vtos(otheritem.origin), "\n");
                                        error("Mapper sucks.");
                                }
                        }
-                       self.is_item = true;
+                       this.is_item = true;
                }
 
                weaponsInMap |= WepSet_FromWeapon(weaponid);
 
-               precache_model (self.model);
-               precache_sound (self.item_pickupsound);
+               precache_model(this.model);
+               precache_sound(this.item_pickupsound);
 
-               if((itemflags & (FL_POWERUP | FL_WEAPON)) || (itemid & (IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2)))
-                       self.target = "###item###"; // for finding the nearest item using find()
+               if (   def.instanceOfPowerup
+                       || def.instanceOfWeaponPickup
+                       || (def.instanceOfHealth && def != ITEM_HealthSmall)
+                       || (def.instanceOfArmor && def != ITEM_ArmorSmall)
+                       || (itemid & (IT_KEY1 | IT_KEY2))
+               ) this.target = "###item###"; // for finding the nearest item using find()
 
-               Item_ItemsTime_SetTime(self, 0);
+               Item_ItemsTime_SetTime(this, 0);
        }
 
-       self.bot_pickup = true;
-       self.bot_pickupevalfunc = pickupevalfunc;
-       self.bot_pickupbasevalue = pickupbasevalue;
-       self.mdl = self.model;
-       self.netname = itemname;
-       self.touch = Item_Touch;
-       setmodel(self, MDL_Null); // precision set below
-       //self.effects |= EF_LOWPRECISION;
+       this.bot_pickup = true;
+       this.bot_pickupevalfunc = pickupevalfunc;
+       this.bot_pickupbasevalue = pickupbasevalue;
+       this.mdl = this.model ? this.model : strzone(this.item_model_ent.model_str());
+       this.netname = itemname;
+       this.touch = Item_Touch;
+       setmodel(this, MDL_Null); // precision set below
+       //this.effects |= EF_LOWPRECISION;
 
-       if((itemflags & FL_POWERUP) || self.health || self.armorvalue)
-       {
-               self.pos1 = '-16 -16 0';
-               self.pos2 = '16 16 48';
-       }
-       else
-       {
-               self.pos1 = '-16 -16 0';
-               self.pos2 = '16 16 32';
-       }
-       setsize (self, self.pos1, self.pos2);
+       setsize (this, this.pos1 =  def.m_mins, this.pos2 = def.m_maxs);
 
-       self.SendFlags |= ISF_SIZE;
-
-       if(!(self.spawnflags & 1024))
-       {
-               if(itemflags & FL_POWERUP)
-                       self.ItemStatus |= ITS_ANIMATE1;
+       this.SendFlags |= ISF_SIZE;
 
-               if(self.armorvalue || self.health)
-                       self.ItemStatus |= ITS_ANIMATE2;
+       if (!(this.spawnflags & 1024)) {
+               if(def.instanceOfPowerup)
+                       this.ItemStatus |= ITS_ANIMATE1;
+       
+               if(this.armorvalue || this.health)
+                       this.ItemStatus |= ITS_ANIMATE2;
        }
 
-       if(itemflags & FL_WEAPON)
+       if(def.instanceOfWeaponPickup)
        {
-               if (self.classname != "droppedweapon") // if dropped, colormap is already set up nicely
-                       self.colormap = 1024; // color shirt=0 pants=0 grey
+               if (this.classname != "droppedweapon") // if dropped, colormap is already set up nicely
+                       this.colormap = 1024; // color shirt=0 pants=0 grey
                else
-                       self.gravity = 1;
-
-               if(!(self.spawnflags & 1024))
-                       self.ItemStatus |= ITS_ANIMATE1;
-               self.ItemStatus |= ISF_COLORMAP;
+                       this.gravity = 1;
+               if (!(this.spawnflags & 1024))
+                       this.ItemStatus |= ITS_ANIMATE1;
+               this.ItemStatus |= ISF_COLORMAP;
        }
 
-       self.state = 0;
-       if(self.team) // broken, no idea why.
+       this.state = 0;
+       if(this.team) // broken, no idea why.
        {
-               if(!self.cnt)
-                       self.cnt = 1; // item probability weight
+               if(!this.cnt)
+                       this.cnt = 1; // item probability weight
 
-               self.effects |= EF_NODRAW; // marker for item team search
-               InitializeEntity(self, Item_FindTeam, INITPRIO_FINDTARGET);
+               this.effects |= EF_NODRAW; // marker for item team search
+               InitializeEntity(this, Item_FindTeam, INITPRIO_FINDTARGET);
        }
        else
-               Item_Reset();
+               Item_Reset(this);
 
-       Net_LinkEntity(self, !((itemflags & FL_POWERUP) || self.health || self.armorvalue), 0, ItemSend);
+       Net_LinkEntity(this, !(def.instanceOfPowerup || def.instanceOfHealth || def.instanceOfArmor), 0, ItemSend);
 
        // call this hook after everything else has been done
-       if(MUTATOR_CALLHOOK(Item_Spawn, self))
+       if (MUTATOR_CALLHOOK(Item_Spawn, this))
        {
                startitem_failed = true;
-               remove(self);
+               remove(this);
                return;
        }
 }
 
-void StartItemA (entity a)
-{SELFPARAM();
-    self.itemdef = a;
-    StartItem(strzone(a.m_model.model_str()), a.m_sound, a.m_respawntime(), a.m_respawntimejitter(), a.m_name, a.m_itemid, 0, a.m_itemflags, a.m_pickupevalfunc, a.m_botvalue);
+void StartItem(entity this, GameItem def)
+{
+    _StartItem(
+       this,
+       this.itemdef = def,
+       def.m_respawntime(), // defaultrespawntime
+       def.m_respawntimejitter() // defaultrespawntimejitter
+       );
 }
 
 spawnfunc(item_rockets)
@@ -1211,7 +1211,7 @@ spawnfunc(item_rockets)
                self.ammo_rockets = g_pickup_rockets;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_ammo_anyway;
-    StartItemA (ITEM_Rockets);
+    StartItem(this, ITEM_Rockets);
 }
 
 spawnfunc(item_bullets)
@@ -1230,7 +1230,7 @@ spawnfunc(item_bullets)
                self.ammo_nails = g_pickup_nails;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_ammo_anyway;
-    StartItemA (ITEM_Bullets);
+    StartItem(this, ITEM_Bullets);
 }
 
 spawnfunc(item_cells)
@@ -1239,7 +1239,7 @@ spawnfunc(item_cells)
                self.ammo_cells = g_pickup_cells;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_ammo_anyway;
-       StartItemA (ITEM_Cells);
+       StartItem(this, ITEM_Cells);
 }
 
 spawnfunc(item_plasma)
@@ -1248,7 +1248,7 @@ spawnfunc(item_plasma)
                self.ammo_plasma = g_pickup_plasma;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_ammo_anyway;
-       StartItemA (ITEM_Plasma);
+       StartItem(this, ITEM_Plasma);
 }
 
 spawnfunc(item_shells)
@@ -1267,7 +1267,7 @@ spawnfunc(item_shells)
                self.ammo_shells = g_pickup_shells;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_ammo_anyway;
-       StartItemA (ITEM_Shells);
+       StartItem(this, ITEM_Shells);
 }
 
 spawnfunc(item_armor_small)
@@ -1278,7 +1278,7 @@ spawnfunc(item_armor_small)
                self.max_armorvalue = g_pickup_armorsmall_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armorsmall_anyway;
-       StartItemA (ITEM_ArmorSmall);
+       StartItem(this, ITEM_ArmorSmall);
 }
 
 spawnfunc(item_armor_medium)
@@ -1289,7 +1289,7 @@ spawnfunc(item_armor_medium)
                self.max_armorvalue = g_pickup_armormedium_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armormedium_anyway;
-       StartItemA (ITEM_ArmorMedium);
+       StartItem(this, ITEM_ArmorMedium);
 }
 
 spawnfunc(item_armor_big)
@@ -1300,7 +1300,7 @@ spawnfunc(item_armor_big)
                self.max_armorvalue = g_pickup_armorbig_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armorbig_anyway;
-       StartItemA (ITEM_ArmorLarge);
+       StartItem(this, ITEM_ArmorLarge);
 }
 
 spawnfunc(item_armor_large)
@@ -1311,7 +1311,7 @@ spawnfunc(item_armor_large)
                self.max_armorvalue = g_pickup_armorlarge_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armorlarge_anyway;
-       StartItemA (ITEM_ArmorMega);
+       StartItem(this, ITEM_ArmorMega);
 }
 
 spawnfunc(item_health_small)
@@ -1322,7 +1322,7 @@ spawnfunc(item_health_small)
                self.health = g_pickup_healthsmall;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_healthsmall_anyway;
-       StartItemA (ITEM_HealthSmall);
+       StartItem(this, ITEM_HealthSmall);
 }
 
 spawnfunc(item_health_medium)
@@ -1333,7 +1333,7 @@ spawnfunc(item_health_medium)
                self.health = g_pickup_healthmedium;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_healthmedium_anyway;
-    StartItemA (ITEM_HealthMedium);
+    StartItem(this, ITEM_HealthMedium);
 }
 
 spawnfunc(item_health_large)
@@ -1344,7 +1344,7 @@ spawnfunc(item_health_large)
                self.health = g_pickup_healthlarge;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_healthlarge_anyway;
-       StartItemA (ITEM_HealthLarge);
+       StartItem(this, ITEM_HealthLarge);
 }
 
 spawnfunc(item_health_mega)
@@ -1355,7 +1355,7 @@ spawnfunc(item_health_mega)
         self.health = g_pickup_healthmega;
     if(!self.pickup_anyway)
         self.pickup_anyway = g_pickup_healthmega_anyway;
-    StartItemA (ITEM_HealthMega);
+    StartItem(this, ITEM_HealthMega);
 }
 
 // support old misnamed entities
@@ -1369,14 +1369,14 @@ spawnfunc(item_strength)
 {
                if(!self.strength_finished)
                        self.strength_finished = autocvar_g_balance_powerup_strength_time;
-               StartItemA (ITEM_Strength);
+               StartItem(this, ITEM_Strength);
 }
 
 spawnfunc(item_invincible)
 {
                if(!self.invincible_finished)
                        self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
-               StartItemA (ITEM_Shield);
+               StartItem(this, ITEM_Shield);
 }
 
 // compatibility:
@@ -1533,7 +1533,7 @@ spawnfunc(item_fuel)
                self.ammo_fuel = g_pickup_fuel;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_ammo_anyway;
-       StartItemA (ITEM_JetpackFuel);
+       StartItem(this, ITEM_JetpackFuel);
 }
 
 spawnfunc(item_fuel_regen)
@@ -1543,7 +1543,7 @@ spawnfunc(item_fuel_regen)
                spawnfunc_item_fuel(this);
                return;
        }
-       StartItemA (ITEM_JetpackRegen);
+       StartItem(this, ITEM_JetpackRegen);
 }
 
 spawnfunc(item_jetpack)
@@ -1555,7 +1555,7 @@ spawnfunc(item_jetpack)
                spawnfunc_item_fuel(this);
                return;
        }
-       StartItemA (ITEM_Jetpack);
+       StartItem(this, ITEM_Jetpack);
 }
 
 float GiveWeapon(entity e, float wpn, float op, float val)