X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=fbb733405646e4c411c9995bc7b51035cb0dd89d;hb=aa18036e4367a72ffe6dee3fea5c31013f7c3139;hp=7d3e59836b9ebb80f85769d2de5a45130942d5d5;hpb=59b6575d5306d671853a67e37aa795f45315562b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 7d3e59836..fbb733405 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -3,19 +3,18 @@
 #include "../common/items/all.qc"
 
 #if defined(SVQC)
-    #include "_all.qh"
 
     #include "bot/bot.qh"
     #include "bot/waypoints.qh"
 
-    #include "mutators/mutators_include.qh"
+    #include "mutators/all.qh"
 
     #include "weapons/common.qh"
     #include "weapons/selection.qh"
     #include "weapons/weaponsystem.qh"
 
     #include "../common/constants.qh"
-    #include "../common/deathtypes.qh"
+    #include "../common/deathtypes/all.qh"
     #include "../common/notifications.qh"
 	#include "../common/triggers/subs.qh"
     #include "../common/util.qh"
@@ -24,54 +23,56 @@
 
     #include "../common/weapons/all.qh"
 
-    #include "../warpzonelib/util_server.qh"
+    #include "../lib/warpzone/util_server.qh"
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_ITEM)
+
 #ifdef CSQC
-void ItemDraw()
-{SELFPARAM();
-    if(self.gravity)
+void ItemDraw(entity this)
+{
+    if(this.gravity)
     {
-        Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);
-        if(self.move_flags & FL_ONGROUND)
+        Movetype_Physics_MatchServer(this, false);
+        if(this.move_flags & FL_ONGROUND)
         { // For some reason move_avelocity gets set to '0 0 0' here ...
-            self.oldorigin = self.origin;
-            self.gravity = 0;
+            this.oldorigin = this.origin;
+            this.gravity = 0;
 
             if(autocvar_cl_animate_items)
             { // ... so reset it if animations are requested.
-                if(self.ItemStatus & ITS_ANIMATE1)
-                    self.move_avelocity = '0 180 0';
+                if(this.ItemStatus & ITS_ANIMATE1)
+                    this.move_avelocity = '0 180 0';
 
-                if(self.ItemStatus & ITS_ANIMATE2)
-                    self.move_avelocity = '0 -90 0';
+                if(this.ItemStatus & ITS_ANIMATE2)
+                    this.move_avelocity = '0 -90 0';
             }
         }
     }
     else if (autocvar_cl_animate_items)
     {
-        if(self.ItemStatus & ITS_ANIMATE1)
+        if(this.ItemStatus & ITS_ANIMATE1)
         {
-            self.angles += self.move_avelocity * frametime;
-            setorigin(self, '0 0 10' + self.oldorigin + '0 0 8' * sin(time * 2));
+            this.angles += this.move_avelocity * frametime;
+            setorigin(this, '0 0 10' + this.oldorigin + '0 0 8' * sin(time * 2));
         }
 
-        if(self.ItemStatus & ITS_ANIMATE2)
+        if(this.ItemStatus & ITS_ANIMATE2)
         {
-            self.angles += self.move_avelocity * frametime;
-            setorigin(self, '0 0 8' + self.oldorigin + '0 0 4' * sin(time * 3));
+            this.angles += this.move_avelocity * frametime;
+            setorigin(this, '0 0 8' + this.oldorigin + '0 0 4' * sin(time * 3));
         }
     }
 }
 
-void ItemDrawSimple()
-{SELFPARAM();
-    if(self.gravity)
+void ItemDrawSimple(entity this)
+{
+    if(this.gravity)
     {
-        Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);
+        Movetype_Physics_MatchServer(this, false);
 
-        if(self.move_flags & FL_ONGROUND)
-            self.gravity = 0;
+        if(this.move_flags & FL_ONGROUND)
+            this.gravity = 0;
     }
 }
 
@@ -95,8 +96,14 @@ void Item_PreDraw()
 		self.drawmask = MASK_NORMAL;
 }
 
-void ItemRead(float _IsNew)
+void ItemRemove()
 {SELFPARAM();
+	if (self.mdl)
+		strunzone(self.mdl);
+}
+
+NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
+{
     int sf = ReadByte();
 
     if(sf & ISF_LOCATION)
@@ -165,8 +172,12 @@ void ItemRead(float _IsNew)
     if(sf & ISF_MODEL)
     {
         self.drawmask  = MASK_NORMAL;
-		self.move_movetype = self.movetype = MOVETYPE_TOSS;
+		self.move_movetype = MOVETYPE_TOSS;
         self.draw       = ItemDraw;
+        self.solid = SOLID_TRIGGER;
+        //self.move_flags |= FL_ITEM;
+
+        bool use_bigsize = ReadByte();
 
         self.fade_end = ReadShort();
         self.fade_start = ReadShort();
@@ -204,10 +215,12 @@ void ItemRead(float _IsNew)
 
 
         if(self.mdl == "")
-            LOG_TRACE("^1WARNING!^7 self.mdl is unset for item ", self.classname, " tell tZork aboute this!\n");
+            LOG_TRACE("^1WARNING!^7 self.mdl is unset for item ", self.classname, ", tell tZork about this!\n");
 
         precache_model(self.mdl);
         _setmodel(self, self.mdl);
+
+        setsize(self, '-16 -16 0', (use_bigsize) ? '16 16 48' : '16 16 32');
     }
 
     if(sf & ISF_COLORMAP)
@@ -216,6 +229,7 @@ void ItemRead(float _IsNew)
     if(sf & ISF_DROP)
     {
         self.gravity = 1;
+        self.pushable = true;
         //self.move_angles = '0 0 0';
         self.move_movetype = MOVETYPE_TOSS;
         self.move_velocity_x = ReadCoord();
@@ -241,19 +255,23 @@ void ItemRead(float _IsNew)
         if(self.ItemStatus & ITS_ANIMATE2)
             self.move_avelocity = '0 -90 0';
     }
+
+    self.entremove = ItemRemove;
+
+    return true;
 }
 
 #endif
 
 #ifdef SVQC
-bool ItemSend(entity to, int sf)
-{SELFPARAM();
+bool ItemSend(entity this, entity to, int sf)
+{
 	if(self.gravity)
 		sf |= ISF_DROP;
 	else
 		sf &= ~ISF_DROP;
 
-	WriteByte(MSG_ENTITY, ENT_CLIENT_ITEM);
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_ITEM);
 	WriteByte(MSG_ENTITY, sf);
 
 	//WriteByte(MSG_ENTITY, self.cnt);
@@ -273,7 +291,8 @@ bool ItemSend(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)
@@ -281,6 +300,8 @@ bool ItemSend(entity to, int sf)
 
 	if(sf & ISF_MODEL)
 	{
+		Pickup p = this.itemdef;
+		WriteByte(MSG_ENTITY, p.instanceOfPowerup || p.instanceOfHealth || p.instanceOfArmor);
 		WriteShort(MSG_ENTITY, self.fade_end);
 		WriteShort(MSG_ENTITY, self.fade_start);
 
@@ -304,14 +325,21 @@ bool ItemSend(entity to, int sf)
 	return true;
 }
 
-void ItemUpdate(entity item)
+void ItemUpdate(entity this)
 {
-	item.SendFlags |= ISF_LOCATION;
+	this.oldorigin = this.origin;
+	this.SendFlags |= ISF_LOCATION;
 }
 
-float have_pickup_item(void)
-{SELFPARAM();
-	if(self.flags & FL_POWERUP)
+void UpdateItemAfterTeleport(entity this)
+{
+	if(this.SendEntity3 == ItemSend)
+		ItemUpdate(this);
+}
+
+bool have_pickup_item(entity this)
+{
+	if(this.itemdef.instanceOfPowerup)
 	{
 		if(autocvar_g_powerups > 0)
 			return true;
@@ -325,7 +353,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;
@@ -378,7 +406,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;
@@ -395,7 +428,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;
@@ -419,10 +452,7 @@ void Item_Think()
 {SELFPARAM();
 	self.nextthink = time;
 	if(self.origin != self.oldorigin)
-	{
-		self.oldorigin = self.origin;
 		ItemUpdate(self);
-	}
 }
 
 bool Item_ItemsTime_SpectatorOnly(GameItem it);
@@ -431,7 +461,7 @@ float Item_ItemsTime_UpdateTime(entity e, float t);
 void Item_ItemsTime_SetTime(entity e, float t);
 void Item_ItemsTime_SetTimesForAllPlayers();
 
-void Item_Respawn (void)
+void Item_Respawn ()
 {SELFPARAM();
 	Item_Show(self, 1);
 	// this is ugly...
@@ -457,7 +487,7 @@ void Item_Respawn (void)
 	Send_Effect(EFFECT_ITEM_RESPAWN, CENTER_OR_VIEWOFS(self), '0 0 0', 1);
 }
 
-void Item_RespawnCountdown (void)
+void Item_RespawnCountdown ()
 {SELFPARAM();
 	if(self.count >= ITEM_RESPAWN_TICKS)
 	{
@@ -474,17 +504,17 @@ void Item_RespawnCountdown (void)
 			MUTATOR_CALLHOOK(Item_RespawnCountdown, string_null, '0 0 0');
 			do {
 				{
-					entity wi = get_weaponinfo(self.weapon);
-					if (wi.m_id) {
-						entity wp = WaypointSprite_Spawn(WP_Weapon, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP);
+					entity wi = Weapons_from(self.weapon);
+					if (wi != WEP_Null) {
+						entity wp = WaypointSprite_Spawn(WP_Weapon, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_Weapon);
 						wp.wp_extra = wi.m_id;
 						break;
 					}
 				}
 				{
 					entity ii = self.itemdef;
-					if (ii.m_id) {
-						entity wp = WaypointSprite_Spawn(WP_Item, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP);
+					if (ii != NULL) {
+						entity wp = WaypointSprite_Spawn(WP_Item, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_Item);
 						wp.wp_extra = ii.m_id;
 						break;
 					}
@@ -502,20 +532,18 @@ void Item_RespawnCountdown (void)
 		if(self.waypointsprite_attached)
 		{
 			setself(self.waypointsprite_attached);
-			entity e;
-			FOR_EACH_REALCLIENT(e)
-				if(self.waypointsprite_visible_for_player(e))
+			FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+				if(self.waypointsprite_visible_for_player(it))
 				{
-					msg_entity = e;
+					msg_entity = it;
 					soundto(MSG_ONE, this, CH_TRIGGER, SND(ITEMRESPAWNCOUNTDOWN), VOL_BASE, ATTEN_NORM);	// play respawn sound
 				}
+			));
 			setself(this);
 
 			WaypointSprite_Ping(self.waypointsprite_attached);
 			//WaypointSprite_UpdateHealth(self.waypointsprite_attached, self.count);
 		}
-		else
-			sound(self, CH_TRIGGER, SND_ITEMRESPAWNCOUNTDOWN, VOL_BASE, ATTEN_NORM);	// play respawn sound
 	}
 }
 
@@ -523,10 +551,7 @@ void Item_RespawnThink()
 {SELFPARAM();
 	self.nextthink = time;
 	if(self.origin != self.oldorigin)
-	{
-		self.oldorigin = self.origin;
 		ItemUpdate(self);
-	}
 
 	if(time >= self.wait)
 		Item_Respawn();
@@ -577,7 +602,7 @@ float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax
 
 	if (item.spawnshieldtime)
 	{
-		if ((player.(ammotype) < ammomax) || item.pickup_anyway)
+		if ((player.(ammotype) < ammomax) || item.pickup_anyway > 0)
 		{
 			player.(ammotype) = bound(player.(ammotype), ammomax, player.(ammotype) + item.(ammotype));
 			goto YEAH;
@@ -617,8 +642,6 @@ float Item_GiveTo(entity item, entity player)
 {
 	float _switchweapon;
 	float pickedup;
-	float it;
-	float i;
 
 	// if nothing happens to player, just return without taking the item
 	pickedup = false;
@@ -627,10 +650,10 @@ float Item_GiveTo(entity item, entity player)
 	// if the player is using their best weapon before items are given, they
 	// probably want to switch to an even better weapon after items are given
 	if (player.autoswitch)
-	if (player.switchweapon == w_getbestweapon(player))
+	if (PS(player).m_switchweapon == w_getbestweapon(player))
 		_switchweapon = true;
 
-	if (!(player.weapons & WepSet_FromWeapon(player.switchweapon)))
+	if (!(player.weapons & WepSet_FromWeapon(PS(player).m_switchweapon)))
 		_switchweapon = true;
 
 	pickedup |= Item_GiveAmmoTo(item, player, ammo_fuel, g_pickup_fuel_max, ITEM_MODE_FUEL);
@@ -642,28 +665,30 @@ 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;
-		it &= ~player.weapons;
+		WepSet w;
+		w = item.weapons;
+		w &= ~player.weapons;
 
-		if (it || (item.spawnshieldtime && item.pickup_anyway))
+		if (w || (item.spawnshieldtime && item.pickup_anyway > 0))
 		{
 			pickedup = true;
-			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-			if(it & WepSet_FromWeapon(i))
-			{
-				W_DropEvent(WR_PICKUP, player, i, item);
-				W_GiveWeapon(player, i);
-			}
+			FOREACH(Weapons, it != WEP_Null, LAMBDA(
+				if(w & (it.m_wepset))
+				{
+					W_DropEvent(wr_pickup, player, it.m_id, item);
+					W_GiveWeapon(player, it.m_id);
+				}
+			));
 		}
 	}
 
-	if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK))
+	int its;
+	if((its = (item.items - (item.items & player.items)) & IT_PICKUPMASK))
 	{
 		pickedup = true;
-		player.items |= it;
+		player.items |= its;
 		Send_Notification(NOTIF_ONE, player, MSG_INFO, INFO_ITEM_WEAPON_GOT, item.netname);
 	}
 
@@ -693,29 +718,29 @@ 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);
+		W_SwitchWeapon_Force(player, Weapons_from(item.weapon));
 		return 1;
 	}
 
 	if (_switchweapon)
-		if (player.switchweapon != w_getbestweapon(player))
+		if (PS(player).m_switchweapon != w_getbestweapon(player))
 			W_SwitchWeapon_Force(player, w_getbestweapon(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;
 		}
 	}
@@ -723,33 +748,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;
 	}
@@ -758,17 +783,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 : Sound_fixpath(this.item_pickupsound_ent)), 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")
@@ -781,28 +807,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();
@@ -834,13 +861,13 @@ void Item_FindTeam()
 			head.effects &= ~EF_NODRAW;
 		}
 
-		Item_Reset();
+		Item_Reset(self);
 	}
 }
 
 // Savage: used for item garbage-collection
 // TODO: perhaps nice special effect?
-void RemoveItem(void)
+void RemoveItem()
 {SELFPARAM();
 	if(wasfreed(self) || !self) { return; }
 	Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(self), '0 0 0', 1);
@@ -904,32 +931,28 @@ float weapon_pickupevalfunc(entity player, entity item)
 
 float commodity_pickupevalfunc(entity player, entity item)
 {
-	float c, i;
+	float c;
 	float need_shells = false, need_nails = false, need_rockets = false, need_cells = false, need_plasma = false, need_fuel = false;
-	entity wi;
 	c = 0;
 
 	// Detect needed ammo
-	for(i = WEP_FIRST; i <= WEP_LAST ; ++i)
-	{
-		wi = get_weaponinfo(i);
-
-		if (!(player.weapons & WepSet_FromWeapon(i)))
+	FOREACH(Weapons, it != WEP_Null, LAMBDA(
+		if(!(player.weapons & (it.m_wepset)))
 			continue;
 
-		if(wi.items & ITEM_Shells.m_itemid)
+		if(it.items & ITEM_Shells.m_itemid)
 			need_shells = true;
-		else if(wi.items & ITEM_Bullets.m_itemid)
+		else if(it.items & ITEM_Bullets.m_itemid)
 			need_nails = true;
-		else if(wi.items & ITEM_Rockets.m_itemid)
+		else if(it.items & ITEM_Rockets.m_itemid)
 			need_rockets = true;
-		else if(wi.items & ITEM_Cells.m_itemid)
+		else if(it.items & ITEM_Cells.m_itemid)
 			need_cells = true;
-		else if(wi.items & ITEM_Plasma.m_itemid)
+		else if(it.items & ITEM_Plasma.m_itemid)
 			need_plasma = true;
-		else if(wi.items & ITEM_JetpackFuel.m_itemid)
+		else if(it.items & ITEM_JetpackFuel.m_itemid)
 			need_fuel = true;
-	}
+	));
 
 	// TODO: figure out if the player even has the weapon this ammo is for?
 	// may not affect strategy much though...
@@ -974,411 +997,397 @@ 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(Weapons_from(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(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.strength_finished || this.invincible_finished || this.superweapons_finished)
 		{
 			// 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;
 		// it's a level item
-		if(self.spawnflags & 1)
-			self.noalign = 1;
-		if (self.noalign)
-			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)
+		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
-			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);
+		weaponsInMap |= WepSet_FromWeapon(Weapons_from(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;
-
-	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);
+	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;
 
-	self.SendFlags |= ISF_SIZE;
+	setsize (this, this.pos1 =  def.m_mins, this.pos2 = def.m_maxs);
 
-	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;
-
-		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
+	);
 }
 
-void spawnfunc_item_rockets()
-{SELFPARAM();
-	if(!self.ammo_rockets)
-		self.ammo_rockets = g_pickup_rockets;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_ammo_anyway;
-    StartItemA (ITEM_Rockets);
+spawnfunc(item_rockets)
+{
+	if(!this.ammo_rockets)
+		this.ammo_rockets = g_pickup_rockets;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_ammo_anyway;
+    StartItem(this, ITEM_Rockets);
 }
 
-void spawnfunc_item_bullets()
-{SELFPARAM();
+spawnfunc(item_bullets)
+{
 	if(!weaponswapping)
 	if(autocvar_sv_q3acompat_machineshotgunswap)
-	if(self.classname != "droppedweapon")
+	if(this.classname != "droppedweapon")
 	{
 		weaponswapping = true;
-		spawnfunc_item_shells();
+		spawnfunc_item_shells(this);
 		weaponswapping = false;
 		return;
 	}
 
-	if(!self.ammo_nails)
-		self.ammo_nails = g_pickup_nails;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_ammo_anyway;
-    StartItemA (ITEM_Bullets);
+	if(!this.ammo_nails)
+		this.ammo_nails = g_pickup_nails;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_ammo_anyway;
+    StartItem(this, ITEM_Bullets);
 }
 
-void spawnfunc_item_cells()
-{SELFPARAM();
-	if(!self.ammo_cells)
-		self.ammo_cells = g_pickup_cells;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_ammo_anyway;
-	StartItemA (ITEM_Cells);
+spawnfunc(item_cells)
+{
+	if(!this.ammo_cells)
+		this.ammo_cells = g_pickup_cells;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_ammo_anyway;
+	StartItem(this, ITEM_Cells);
 }
 
-void spawnfunc_item_plasma()
-{SELFPARAM();
-	if(!self.ammo_plasma)
-		self.ammo_plasma = g_pickup_plasma;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_ammo_anyway;
-	StartItemA (ITEM_Plasma);
+spawnfunc(item_plasma)
+{
+	if(!this.ammo_plasma)
+		this.ammo_plasma = g_pickup_plasma;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_ammo_anyway;
+	StartItem(this, ITEM_Plasma);
 }
 
-void spawnfunc_item_shells()
-{SELFPARAM();
+spawnfunc(item_shells)
+{
 	if(!weaponswapping)
 	if(autocvar_sv_q3acompat_machineshotgunswap)
-	if(self.classname != "droppedweapon")
+	if(this.classname != "droppedweapon")
 	{
 		weaponswapping = true;
-		spawnfunc_item_bullets();
+		spawnfunc_item_bullets(this);
 		weaponswapping = false;
 		return;
 	}
 
-	if(!self.ammo_shells)
-		self.ammo_shells = g_pickup_shells;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_ammo_anyway;
-	StartItemA (ITEM_Shells);
+	if(!this.ammo_shells)
+		this.ammo_shells = g_pickup_shells;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_ammo_anyway;
+	StartItem(this, ITEM_Shells);
 }
 
-void spawnfunc_item_armor_small()
-{SELFPARAM();
-	if(!self.armorvalue)
-		self.armorvalue = g_pickup_armorsmall;
-	if(!self.max_armorvalue)
-		self.max_armorvalue = g_pickup_armorsmall_max;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_armorsmall_anyway;
-	StartItemA (ITEM_ArmorSmall);
+spawnfunc(item_armor_small)
+{
+	if(!this.armorvalue)
+		this.armorvalue = g_pickup_armorsmall;
+	if(!this.max_armorvalue)
+		this.max_armorvalue = g_pickup_armorsmall_max;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_armorsmall_anyway;
+	StartItem(this, ITEM_ArmorSmall);
 }
 
-void spawnfunc_item_armor_medium()
-{SELFPARAM();
-	if(!self.armorvalue)
-		self.armorvalue = g_pickup_armormedium;
-	if(!self.max_armorvalue)
-		self.max_armorvalue = g_pickup_armormedium_max;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_armormedium_anyway;
-	StartItemA (ITEM_ArmorMedium);
+spawnfunc(item_armor_medium)
+{
+	if(!this.armorvalue)
+		this.armorvalue = g_pickup_armormedium;
+	if(!this.max_armorvalue)
+		this.max_armorvalue = g_pickup_armormedium_max;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_armormedium_anyway;
+	StartItem(this, ITEM_ArmorMedium);
 }
 
-void spawnfunc_item_armor_big()
-{SELFPARAM();
-	if(!self.armorvalue)
-		self.armorvalue = g_pickup_armorbig;
-	if(!self.max_armorvalue)
-		self.max_armorvalue = g_pickup_armorbig_max;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_armorbig_anyway;
-	StartItemA (ITEM_ArmorLarge);
+spawnfunc(item_armor_big)
+{
+	if(!this.armorvalue)
+		this.armorvalue = g_pickup_armorbig;
+	if(!this.max_armorvalue)
+		this.max_armorvalue = g_pickup_armorbig_max;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_armorbig_anyway;
+	StartItem(this, ITEM_ArmorLarge);
 }
 
-void spawnfunc_item_armor_large()
-{SELFPARAM();
-	if(!self.armorvalue)
-		self.armorvalue = g_pickup_armorlarge;
-	if(!self.max_armorvalue)
-		self.max_armorvalue = g_pickup_armorlarge_max;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_armorlarge_anyway;
-	StartItemA (ITEM_ArmorMega);
+spawnfunc(item_armor_large)
+{
+	if(!this.armorvalue)
+		this.armorvalue = g_pickup_armorlarge;
+	if(!this.max_armorvalue)
+		this.max_armorvalue = g_pickup_armorlarge_max;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_armorlarge_anyway;
+	StartItem(this, ITEM_ArmorMega);
 }
 
-void spawnfunc_item_health_small()
-{SELFPARAM();
-	if(!self.max_health)
-		self.max_health = g_pickup_healthsmall_max;
-	if(!self.health)
-		self.health = g_pickup_healthsmall;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_healthsmall_anyway;
-	StartItemA (ITEM_HealthSmall);
+spawnfunc(item_health_small)
+{
+	if(!this.max_health)
+		this.max_health = g_pickup_healthsmall_max;
+	if(!this.health)
+		this.health = g_pickup_healthsmall;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_healthsmall_anyway;
+	StartItem(this, ITEM_HealthSmall);
 }
 
-void spawnfunc_item_health_medium()
-{SELFPARAM();
-	if(!self.max_health)
-		self.max_health = g_pickup_healthmedium_max;
-	if(!self.health)
-		self.health = g_pickup_healthmedium;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_healthmedium_anyway;
-    StartItemA (ITEM_HealthMedium);
+spawnfunc(item_health_medium)
+{
+	if(!this.max_health)
+		this.max_health = g_pickup_healthmedium_max;
+	if(!this.health)
+		this.health = g_pickup_healthmedium;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_healthmedium_anyway;
+    StartItem(this, ITEM_HealthMedium);
 }
 
-void spawnfunc_item_health_large()
-{SELFPARAM();
-	if(!self.max_health)
-		self.max_health = g_pickup_healthlarge_max;
-	if(!self.health)
-		self.health = g_pickup_healthlarge;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_healthlarge_anyway;
-	StartItemA (ITEM_HealthLarge);
+spawnfunc(item_health_large)
+{
+	if(!this.max_health)
+		this.max_health = g_pickup_healthlarge_max;
+	if(!this.health)
+		this.health = g_pickup_healthlarge;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_healthlarge_anyway;
+	StartItem(this, ITEM_HealthLarge);
 }
 
-void spawnfunc_item_health_mega()
-{SELFPARAM();
-    if(!self.max_health)
-        self.max_health = g_pickup_healthmega_max;
-    if(!self.health)
-        self.health = g_pickup_healthmega;
-    if(!self.pickup_anyway)
-        self.pickup_anyway = g_pickup_healthmega_anyway;
-    StartItemA (ITEM_HealthMega);
+spawnfunc(item_health_mega)
+{
+    if(!this.max_health)
+        this.max_health = g_pickup_healthmega_max;
+    if(!this.health)
+        this.health = g_pickup_healthmega;
+    if(!this.pickup_anyway)
+        this.pickup_anyway = g_pickup_healthmega_anyway;
+    StartItem(this, ITEM_HealthMega);
 }
 
 // support old misnamed entities
-void spawnfunc_item_armor1() { spawnfunc_item_armor_small(); }  // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard
-void spawnfunc_item_armor25() { spawnfunc_item_armor_large(); }
-void spawnfunc_item_health1() { spawnfunc_item_health_small(); }
-void spawnfunc_item_health25() { spawnfunc_item_health_medium(); }
-void spawnfunc_item_health100() { spawnfunc_item_health_mega(); }
+spawnfunc(item_armor1) { spawnfunc_item_armor_small(this); }  // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard
+spawnfunc(item_armor25) { spawnfunc_item_armor_large(this); }
+spawnfunc(item_health1) { spawnfunc_item_health_small(this); }
+spawnfunc(item_health25) { spawnfunc_item_health_medium(this); }
+spawnfunc(item_health100) { spawnfunc_item_health_mega(this); }
 
-void spawnfunc_item_strength()
-{SELFPARAM();
-		if(!self.strength_finished)
-			self.strength_finished = autocvar_g_balance_powerup_strength_time;
-		StartItemA (ITEM_Strength);
+spawnfunc(item_strength)
+{
+		if(!this.strength_finished)
+			this.strength_finished = autocvar_g_balance_powerup_strength_time;
+		StartItem(this, ITEM_Strength);
 }
 
-void spawnfunc_item_invincible()
-{SELFPARAM();
-		if(!self.invincible_finished)
-			self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
-		StartItemA (ITEM_Shield);
+spawnfunc(item_invincible)
+{
+		if(!this.invincible_finished)
+			this.invincible_finished = autocvar_g_balance_powerup_invincible_time;
+		StartItem(this, ITEM_Shield);
 }
 
 // compatibility:
-void spawnfunc_item_quad() {SELFPARAM(); self.classname = "item_strength";spawnfunc_item_strength();}
+spawnfunc(item_quad) { this.classname = "item_strength";spawnfunc_item_strength(this);}
 
 void target_items_use()
 {SELFPARAM();
@@ -1404,10 +1413,9 @@ void target_items_use()
 		centerprint(activator, self.message);
 }
 
-void spawnfunc_target_items (void)
-{SELFPARAM();
-	float n, i, j;
-	entity e;
+spawnfunc(target_items)
+{
+	float n, i;
 	string s;
 
 	self.use = target_items_use;
@@ -1437,20 +1445,16 @@ void spawnfunc_target_items (void)
 			else if(argv(i) == "fuel_regen")             self.items |= ITEM_JetpackRegen.m_itemid;
 			else
 			{
-				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-				{
-					e = get_weaponinfo(j);
+				FOREACH(Weapons, it != WEP_Null, LAMBDA(
 					s = W_UndeprecateName(argv(i));
-					if(s == e.netname)
+					if(s == it.netname)
 					{
-						self.weapons |= WepSet_FromWeapon(j);
+						self.weapons |= (it.m_wepset);
 						if(self.spawnflags == 0 || self.spawnflags == 2)
-							WEP_ACTION(e.weapon, WR_INIT);
+							it.wr_init(it);
 						break;
 					}
-				}
-				if(j > WEP_LAST)
-					LOG_INFO("target_items: invalid item ", argv(i), "\n");
+				));
 			}
 		}
 
@@ -1482,13 +1486,13 @@ void spawnfunc_target_items (void)
 		}
 
 		self.netname = "";
-		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_UNLIMITED_WEAPON_AMMO), "unlimited_weapon_ammo");
-		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & IT_UNLIMITED_SUPERWEAPONS), "unlimited_superweapons");
-		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.strength_finished * !!(self.items & ITEM_Strength.m_itemid), "strength");
-		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.invincible_finished * !!(self.items & ITEM_Shield.m_itemid), "invincible");
-		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.superweapons_finished * !!(self.items & IT_SUPERWEAPON), "superweapons");
-		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & ITEM_Jetpack.m_itemid), "jetpack");
-		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.items & ITEM_JetpackRegen.m_itemid), "fuel_regen");
+		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, boolean(self.items & IT_UNLIMITED_WEAPON_AMMO), "unlimited_weapon_ammo");
+		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, boolean(self.items & IT_UNLIMITED_SUPERWEAPONS), "unlimited_superweapons");
+		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.strength_finished * boolean(self.items & ITEM_Strength.m_itemid), "strength");
+		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.invincible_finished * boolean(self.items & ITEM_Shield.m_itemid), "invincible");
+		self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, self.superweapons_finished * boolean(self.items & IT_SUPERWEAPON), "superweapons");
+		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, boolean(self.items & ITEM_Jetpack.m_itemid), "jetpack");
+		self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, boolean(self.items & ITEM_JetpackRegen.m_itemid), "fuel_regen");
 		if(self.ammo_shells != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_shells), "shells");
 		if(self.ammo_nails != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_nails), "nails");
 		if(self.ammo_rockets != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_rockets), "rockets");
@@ -1497,12 +1501,7 @@ void spawnfunc_target_items (void)
 		if(self.ammo_fuel != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.ammo_fuel), "fuel");
 		if(self.health != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.health), "health");
 		if(self.armorvalue != 0) self.netname = sprintf("%s %s%d %s", self.netname, valueprefix, max(0, self.health), "armor");
-		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-		{
-			e = get_weaponinfo(j);
-			if(e.weapon)
-				self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.weapons & WepSet_FromWeapon(j)), e.netname);
-		}
+		FOREACH(Weapons, it != WEP_Null, LAMBDA(self.netname = sprintf("%s %s%d %s", self.netname, itemprefix, !!(self.weapons & (it.m_wepset)), it.netname)));
 	}
 	self.netname = strzone(self.netname);
 	//print(self.netname, "\n");
@@ -1510,132 +1509,75 @@ void spawnfunc_target_items (void)
 	n = tokenize_console(self.netname);
 	for(i = 0; i < n; ++i)
 	{
-		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-		{
-			e = get_weaponinfo(j);
-			if(argv(i) == e.netname)
+		FOREACH(Weapons, it != WEP_Null, LAMBDA(
+			if(argv(i) == it.netname)
 			{
-				WEP_ACTION(e.weapon, WR_INIT);
+				it.wr_init(it);
 				break;
 			}
-		}
+		));
 	}
 }
 
-void spawnfunc_item_fuel(void)
-{SELFPARAM();
-	if(!self.ammo_fuel)
-		self.ammo_fuel = g_pickup_fuel;
-	if(!self.pickup_anyway)
-		self.pickup_anyway = g_pickup_ammo_anyway;
-	StartItemA (ITEM_JetpackFuel);
+spawnfunc(item_fuel)
+{
+	if(!this.ammo_fuel)
+		this.ammo_fuel = g_pickup_fuel;
+	if(!this.pickup_anyway)
+		this.pickup_anyway = g_pickup_ammo_anyway;
+	StartItem(this, ITEM_JetpackFuel);
 }
 
-void spawnfunc_item_fuel_regen(void)
+spawnfunc(item_fuel_regen)
 {
 	if(start_items & ITEM_JetpackRegen.m_itemid)
 	{
-		spawnfunc_item_fuel();
+		spawnfunc_item_fuel(this);
 		return;
 	}
-	StartItemA (ITEM_JetpackRegen);
+	StartItem(this, ITEM_JetpackRegen);
 }
 
-void spawnfunc_item_jetpack(void)
-{SELFPARAM();
-	if(!self.ammo_fuel)
-		self.ammo_fuel = g_pickup_fuel_jetpack;
+spawnfunc(item_jetpack)
+{
+	if(!this.ammo_fuel)
+		this.ammo_fuel = g_pickup_fuel_jetpack;
 	if(start_items & ITEM_Jetpack.m_itemid)
 	{
-		spawnfunc_item_fuel();
+		spawnfunc_item_fuel(this);
 		return;
 	}
-	StartItemA (ITEM_Jetpack);
+	StartItem(this, ITEM_Jetpack);
 }
 
 float GiveWeapon(entity e, float wpn, float op, float val)
 {
 	WepSet v0, v1;
-	v0 = (e.weapons & WepSet_FromWeapon(wpn));
-	switch(op)
-	{
-		case OP_SET:
-			if(val > 0)
-				e.weapons |= WepSet_FromWeapon(wpn);
-			else
-				e.weapons &= ~WepSet_FromWeapon(wpn);
-			break;
-		case OP_MIN:
-		case OP_PLUS:
-			if(val > 0)
-				e.weapons |= WepSet_FromWeapon(wpn);
-			break;
-		case OP_MAX:
-			if(val <= 0)
-				e.weapons &= ~WepSet_FromWeapon(wpn);
-			break;
-		case OP_MINUS:
-			if(val > 0)
-				e.weapons &= ~WepSet_FromWeapon(wpn);
-			break;
-	}
-	v1 = (e.weapons & WepSet_FromWeapon(wpn));
-	return (v0 != v1);
-}
-
-float GiveBit(entity e, .float fld, float bit, float op, float val)
-{
-	float v0, v1;
-	v0 = (e.(fld) & bit);
+	WepSet s = WepSet_FromWeapon(Weapons_from(wpn));
+	v0 = (e.weapons & s);
 	switch(op)
 	{
 		case OP_SET:
 			if(val > 0)
-				e.(fld) |= bit;
+				e.weapons |= s;
 			else
-				e.(fld) &= ~bit;
+				e.weapons &= ~s;
 			break;
 		case OP_MIN:
 		case OP_PLUS:
 			if(val > 0)
-				e.(fld) |= bit;
+				e.weapons |= s;
 			break;
 		case OP_MAX:
 			if(val <= 0)
-				e.(fld) &= ~bit;
+				e.weapons &= ~s;
 			break;
 		case OP_MINUS:
 			if(val > 0)
-				e.(fld) &= ~bit;
-			break;
-	}
-	v1 = (e.(fld) & bit);
-	return (v0 != v1);
-}
-
-float GiveValue(entity e, .float fld, float op, float val)
-{
-	float v0, v1;
-	v0 = e.(fld);
-	switch(op)
-	{
-		case OP_SET:
-			e.(fld) = val;
-			break;
-		case OP_MIN:
-			e.(fld) = max(e.(fld), val); // min 100 cells = at least 100 cells
-			break;
-		case OP_MAX:
-			e.(fld) = min(e.(fld), val);
-			break;
-		case OP_PLUS:
-			e.(fld) += val;
-			break;
-		case OP_MINUS:
-			e.(fld) -= val;
+				e.weapons &= ~s;
 			break;
 	}
-	v1 = e.(fld);
+	v1 = (e.weapons & s);
 	return (v0 != v1);
 }
 
@@ -1664,9 +1606,8 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa
 }
 float GiveItems(entity e, float beginarg, float endarg)
 {SELFPARAM();
-	float got, i, j, val, op;
+	float got, i, val, op;
 	float _switchweapon;
-	entity wi;
 	string cmd;
 
 	val = 999;
@@ -1676,7 +1617,7 @@ float GiveItems(entity e, float beginarg, float endarg)
 
 	_switchweapon = false;
 	if (e.autoswitch)
-		if (e.switchweapon == w_getbestweapon(e))
+		if (PS(e).m_switchweapon == w_getbestweapon(e))
 			_switchweapon = true;
 
 	e.strength_finished = max(0, e.strength_finished - time);
@@ -1735,13 +1676,10 @@ float GiveItems(entity e, float beginarg, float endarg)
 				got += GiveValue(e, health, op, val);
 				got += GiveValue(e, armorvalue, op, val);
 			case "allweapons":
-				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-				{
-					wi = get_weaponinfo(j);
-					if(wi.weapon)
-						if (!(wi.spawnflags & WEP_FLAG_MUTATORBLOCKED))
-							got += GiveWeapon(e, j, op, val);
-				}
+				FOREACH(Weapons, it != WEP_Null, LAMBDA(
+					if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+						got += GiveWeapon(e, it.m_id, op, val);
+				));
 			case "allammo":
 				got += GiveValue(e, ammo_cells, op, val);
 				got += GiveValue(e, ammo_plasma, op, val);
@@ -1800,17 +1738,13 @@ float GiveItems(entity e, float beginarg, float endarg)
 				got += GiveValue(e, ammo_fuel, op, val);
 				break;
 			default:
-				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-				{
-					wi = get_weaponinfo(j);
-					if(cmd == wi.netname)
+				FOREACH(Weapons, it != WEP_Null, LAMBDA(
+					if(cmd == it.netname)
 					{
-						got += GiveWeapon(e, j, op, val);
+						got += GiveWeapon(e, it.m_id, op, val);
 						break;
 					}
-				}
-				if(j > WEP_LAST)
-					LOG_INFO("give: invalid item ", cmd, "\n");
+				));
 				break;
 		}
 		val = 999;
@@ -1821,17 +1755,12 @@ float GiveItems(entity e, float beginarg, float endarg)
 	POSTGIVE_BIT(e, items, IT_UNLIMITED_SUPERWEAPONS, SND(POWERUP), SND(POWEROFF));
 	POSTGIVE_BIT(e, items, IT_UNLIMITED_WEAPON_AMMO, SND(POWERUP), SND(POWEROFF));
 	POSTGIVE_BIT(e, items, ITEM_Jetpack.m_itemid, SND(ITEMPICKUP), string_null);
-	for(j = WEP_FIRST; j <= WEP_LAST; ++j)
-	{
-		wi = get_weaponinfo(j);
-		if(wi.weapon)
-		{
-			POSTGIVE_WEAPON(e, j, SND(WEAPONPICKUP), string_null);
-			if (!(save_weapons & WepSet_FromWeapon(j)))
-				if(e.weapons & WepSet_FromWeapon(j))
-					WEP_ACTION(wi.weapon, WR_INIT);
-		}
-	}
+	FOREACH(Weapons, it != WEP_Null, LAMBDA(
+		POSTGIVE_WEAPON(e, it, SND(WEAPONPICKUP), string_null);
+		if(!(save_weapons & (it.m_wepset)))
+			if(e.weapons & (it.m_wepset))
+				it.wr_init(it);
+	));
 	POSTGIVE_VALUE(e, strength_finished, 1, SND(POWERUP), SND(POWEROFF));
 	POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", SND(POWEROFF));
 	POSTGIVE_VALUE(e, ammo_nails, 0, SND(ITEMPICKUP), string_null);
@@ -1860,7 +1789,7 @@ float GiveItems(entity e, float beginarg, float endarg)
 	else
 		e.superweapons_finished += time;
 
-	if (!(e.weapons & WepSet_FromWeapon(e.switchweapon)))
+	if (!(e.weapons & WepSet_FromWeapon(PS(e).m_switchweapon)))
 		_switchweapon = true;
 	if(_switchweapon)
 		W_SwitchWeapon_Force(e, w_getbestweapon(e));