Merge branch 'FriskTheFallenHuman:main' into dmap-fixes

m0rb · web-flow · commit baabe82d5b32 · 2026-07-09T09:30:34.000-04:00
diff --git a/neo/Prey/prey_items.cpp b/neo/Prey/prey_items.cpp
@@ -198,6 +198,9 @@ hhItem::SinglePlayerPickup
 */
 void hhItem::SinglePlayerPickup( idPlayer *player ) {
 	if ( !GiveToPlayer( player ) ) {
+		if ( fl.onlySpiritWalkTouch && targets.Num() > 0 ) {
+			DetermineRemoveOrRespawn( AnnouncePickup( player ) );
+		}
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,9 @@ hhItem::SinglePlayerPickup`
`198`	`198`	`*/`
`199`	`199`	`void hhItem::SinglePlayerPickup( idPlayer *player ) {`
`200`	`200`	`if ( !GiveToPlayer( player ) ) {`
	`201`	`+ if ( fl.onlySpiritWalkTouch && targets.Num() > 0 ) {`
	`202`	`+ DetermineRemoveOrRespawn( AnnouncePickup( player ) );`
	`203`	`+ }`
`201`	`204`	`return;`
`202`	`205`	`}`
`203`	`206`