Merge branch 'devel' into experimental

zscript/compat.zsc

@@ -47,6 +47,23 @@ Class UTHereticBlueKey : KeyBlue
 	}
 }
 
+// TODO Base class for items that can be activated from the inventory bar
+Class UTActivatable : Inventory
+{
+	Default
+	{
+		+INVENTORY.INVBAR;
+	}
+}
+
+// These have to be subclassed from HealthPickup for auto-use
+Class UTActivatableHealth : HealthPickup
+{
+	Default
+	{
+	}
+}
+
 // Alternative player classes for compatibility with Heretic sprites
 Class UTPlayerHereticCompat : UTPlayer
 {

zscript/utcommon.zsc

@@ -160,7 +160,10 @@ Class UTPlayer : DoomPlayer
 			{
 				let type = (class<Inventory>)(AllActorClasses[i]);
 				if ( !type ) continue;
-				let def = GetDefaultByType (type);
+				let def = GetDefaultByType(type);
+				if ( !(self is "UTPlayerHereticCompat")
+					&& ((type is "UTActivatable") || (type is "UTActivatableHealth")) )
+					continue;	// don't give these outside of Heretic/Hexen
 				if ( def.Icon.isValid() && (def.MaxAmount > 1) &&
 					!(type is "PuzzleItem") && !(type is "Powerup") && !(type is "Ammo") &&	!(type is "Armor"))
 				{