From 7c7a8413c9ee6b6c29cc59297d5073d96c1a803f Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Sat, 4 Jun 2016 20:02:11 +0100 Subject: [PATCH] Instead of hacking the existing Question Block thinker to ignore the object, let's just... not give the Brick Block a thinker in the first place. --- src/p_floor.c | 11 ++++------- src/p_spec.c | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/p_floor.c b/src/p_floor.c index d86b567df..0656458eb 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -1797,13 +1797,10 @@ static mobj_t *SearchMarioNode(msecnode_t *node) void T_MarioBlockChecker(levelspecthink_t *block) { line_t *masterline = block->sourceline; - if (!(masterline->flags & ML_NOCLIMB)) // Don't change the textures of a brick block, just a question block - { - if (SearchMarioNode(block->sector->touching_thinglist)) - sides[masterline->sidenum[0]].midtexture = sides[masterline->sidenum[0]].bottomtexture; - else - sides[masterline->sidenum[0]].midtexture = sides[masterline->sidenum[0]].toptexture; - } + if (SearchMarioNode(block->sector->touching_thinglist)) + sides[masterline->sidenum[0]].midtexture = sides[masterline->sidenum[0]].bottomtexture; + else + sides[masterline->sidenum[0]].midtexture = sides[masterline->sidenum[0]].toptexture; } // This is the Thwomp's 'brain'. It looks around for players nearby, and if diff --git a/src/p_spec.c b/src/p_spec.c index 0112d02a7..a4a069dd2 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -4933,7 +4933,8 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f if ((flags & FF_MARIO)) { - P_AddBlockThinker(sec2, master); + if (!(master->flags & ML_NOCLIMB)) // Don't change the textures of a brick block, just a question block + P_AddBlockThinker(sec2, master); CheckForMarioBlocks = true; }