stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source
This commit is contained in:
toasterbabe 2016-06-04 20:02:11 +01:00
parent 58d0d2d5e9
commit 7c7a8413c9
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_floor.c
View file

@ -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

3
src/p_spec.c
View file

@ -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;
}