From ebc4e5b4e1b71273baacafa8c9f6b4fd17be164a Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 10 Aug 2012 02:17:16 +0000 Subject: [PATCH] - Fixed: P_TouchSpecialThing() considered all pickup items to be 32 units tall for the sake of touching, even if they were taller. SVN r3814 (trunk) --- src/p_interaction.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 70009f4ee..3ad2770e9 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -86,7 +86,9 @@ void P_TouchSpecialThing (AActor *special, AActor *toucher) { fixed_t delta = special->z - toucher->z; - if (delta > toucher->height || delta < -32*FRACUNIT) + // The pickup is at or above the toucher's feet OR + // The pickup is below the toucher. + if (delta > toucher->height || delta < MIN(-32*FRACUNIT, -special->height)) { // out of reach return; }