From 4839586617d054be95b0b7cf385e46a6ac2d0683 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 7 Mar 2022 13:45:15 +0000 Subject: [PATCH] Allow GTR_PAPERITEMS to function in a hypothetical GTR_CIRCUIT-based custom gametype. --- src/p_mobj.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index da5ca1569..7a40af025 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11317,13 +11317,11 @@ static mobjtype_t P_GetMobjtypeSubstitute(mapthing_t *mthing, mobjtype_t i) { (void)mthing; - if ((gametyperules & GTR_SPHERES) && (i == MT_RING)) + if ((i == MT_RING) && (gametyperules & GTR_SPHERES)) return MT_BLUESPHERE; - /* - if ((gametyperules & GTR_PAPERITEMS) && !bossinfo.boss && (i == MT_RANDOMITEM)) + if ((i == MT_RANDOMITEM) && (gametyperules & (GTR_PAPERITEMS|GTR_CIRCUIT)) == (GTR_PAPERITEMS|GTR_CIRCUIT) && !bossinfo.boss) return MT_PAPERITEMSPOT; - */ return i; }