Merge https://github.com/rheit/zdoom

src/c_cmds.cpp

@@ -906,6 +906,16 @@ CCMD(info)
 				"the NOBLOCKMAP flag or have height/radius of 0.\n");
 }
 
+CCMD(myinfo)
+{
+	if (CheckCheatmode () || players[consoleplayer].mo == NULL) return;
+	Printf("Target=%s, Health=%d, Spawnhealth=%d\n",
+		players[consoleplayer].mo->GetClass()->TypeName.GetChars(),
+		players[consoleplayer].mo->health,
+		players[consoleplayer].mo->SpawnHealth());
+	PrintMiscActorInfo(players[consoleplayer].mo);
+}
+
 typedef bool (*ActorTypeChecker) (AActor *);
 
 static bool IsActorAMonster(AActor *mo)

src/g_inventory/a_pickups.cpp

@@ -1598,6 +1598,30 @@ CCMD (printinv)
 	}
 }
 
+CCMD (targetinv)
+{
+	AInventory *item;
+	FTranslatedLineTarget t;
+
+	if (CheckCheatmode () || players[consoleplayer].mo == NULL)
+		return;
+
+	P_AimLineAttack(players[consoleplayer].mo,players[consoleplayer].mo->Angles.Yaw, MISSILERANGE,
+		&t, 0.,	ALF_CHECKNONSHOOTABLE|ALF_FORCENOSMART);
+
+	if (t.linetarget)
+	{
+		for (item = t.linetarget->Inventory; item != NULL; item = item->Inventory)
+		{
+			Printf ("%s #%u (%d/%d)\n", item->GetClass()->TypeName.GetChars(),
+				item->InventoryID,
+				item->Amount, item->MaxAmount);
+		}
+	}
+	else Printf("No target found. Targetinv cannot find actors that have "
+				"the NOBLOCKMAP flag or have height/radius of 0.\n");
+}
+
 //===========================================================================
 //
 // AInventory :: AttachToOwner