- explode bouncing objects directly inside P_BounceActor if the bounc…

…e count expired. The calling code is too messed up to handle this cleanly.
coelckers · Jan 27, 2017 · 1eb2c753288a8baf61535aed4c5d25f39013de7e · 1eb2c75 · StrikerMan780 · Jan 27, 2017
1 parent 08c2522
commit 1eb2c753288a8baf61535aed4c5d25f39013de7e
Unified Split

Showing with 8 additions and 1 deletion.

+8 −1 src/p_map.cpp
diff --git a/src/p_map.cpp b/src/p_map.cpp
@@ -3532,7 +3532,14 @@ bool P_BounceActor(AActor *mo, AActor *BlockingMobj, bool ontop)
 		|| ((mo->flags6 & MF6_NOBOSSRIP) && (BlockingMobj->flags2 & MF2_BOSS))) && (BlockingMobj->flags2 & MF2_REFLECTIVE))
 		|| ((BlockingMobj->player == NULL) && (!(BlockingMobj->flags3 & MF3_ISMONSTER)))))
 	{
-		if (mo->bouncecount > 0 && --mo->bouncecount == 0) return false;
+		if (mo->bouncecount>0 && --mo->bouncecount == 0)
+		{
+			if (mo->flags & MF_MISSILE)
+				P_ExplodeMissile(mo, nullptr, nullptr);
+			else
+				mo->CallDie(nullptr, nullptr);
+			return true;
+		}

 		if (mo->flags7 & MF7_HITTARGET)	mo->target = BlockingMobj;
 		if (mo->flags7 & MF7_HITMASTER)	mo->master = BlockingMobj;