stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix thinker functions that still use tag instead of args[0] for FOFs

Browse source
This commit is contained in:
MascaraSnake 2021-09-26 06:48:26 +02:00
parent 19823fadbc
commit f26f41e03a
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_floor.c
View file

@ -634,7 +634,6 @@ void T_BounceCheese(bouncecheese_t *bouncer)
sector_t *actionsector; sector_t *actionsector;
boolean remove; boolean remove;
INT32 i; INT32 i;
mtag_t tag = Tag_FGet(&bouncer->sourceline->tags);
if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT
|| bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself! || bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself!
@ -649,7 +648,7 @@ void T_BounceCheese(bouncecheese_t *bouncer)
} }
// You can use multiple target sectors, but at your own risk!!! // You can use multiple target sectors, but at your own risk!!!
TAG_ITER_SECTORS(tag, i) TAG_ITER_SECTORS(bouncer->sourceline->args[0], i)
{ {
actionsector = &sectors[i]; actionsector = &sectors[i];
actionsector->moved = true; actionsector->moved = true;
@ -773,7 +772,7 @@ void T_StartCrumble(crumble_t *crumble)
ffloor_t *rover; ffloor_t *rover;
sector_t *sector; sector_t *sector;
INT32 i; INT32 i;
mtag_t tag = Tag_FGet(&crumble->sourceline->tags); mtag_t tag = crumble->sourceline->args[0];
// Once done, the no-return thinker just sits there, // Once done, the no-return thinker just sits there,
// constantly 'returning'... kind of an oxymoron, isn't it? // constantly 'returning'... kind of an oxymoron, isn't it?
@ -1301,14 +1300,13 @@ void T_NoEnemiesSector(noenemies_t *nobaddies)
for (i = 0; i < sec->linecount; i++) for (i = 0; i < sec->linecount; i++)
{ {
INT32 targetsecnum = -1; INT32 targetsecnum = -1;
mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags);
if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300) if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300)
continue; continue;
FOFsector = true; FOFsector = true;
TAG_ITER_SECTORS(tag2, targetsecnum) TAG_ITER_SECTORS(sec->lines[i]->args[0], targetsecnum)
{ {
if (T_SectorHasEnemies(&sectors[targetsecnum])) if (T_SectorHasEnemies(&sectors[targetsecnum]))
return; return;
@ -1421,14 +1419,13 @@ void T_EachTimeThinker(eachtime_t *eachtime)
for (i = 0; i < sec->linecount; i++) for (i = 0; i < sec->linecount; i++)
{ {
INT32 targetsecnum = -1; INT32 targetsecnum = -1;
mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags);
if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300) if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300)
continue; continue;
FOFsector = true; FOFsector = true;
TAG_ITER_SECTORS(tag2, targetsecnum) TAG_ITER_SECTORS(sec->lines[i]->args[0], targetsecnum)
{ {
targetsec = &sectors[targetsecnum]; targetsec = &sectors[targetsecnum];
@ -2418,7 +2415,7 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
block->direction = 1; block->direction = 1;
block->floorstartheight = block->sector->floorheight; block->floorstartheight = block->sector->floorheight;
block->ceilingstartheight = block->sector->ceilingheight; block->ceilingstartheight = block->sector->ceilingheight;
block->tag = (INT16)Tag_FGet(&sector->tags); block->tag = (INT16)rover->master->args[0];
if (itsamonitor) if (itsamonitor)
{ {

10
src/p_spec.c
View file

@ -5660,7 +5660,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, I
if ((flags & FF_FLOATBOB)) if ((flags & FF_FLOATBOB))
{ {
P_AddFloatThinker(sec2, Tag_FGet(&master->tags), master); P_AddFloatThinker(sec2, master->args[0], master);
CheckForFloatBob = true; CheckForFloatBob = true;
} }
@ -5840,7 +5840,7 @@ static inline void P_AddThwompThinker(sector_t *sec, line_t *sourceline, fixed_t
thwomp->floorstartheight = sec->floorheight; thwomp->floorstartheight = sec->floorheight;
thwomp->ceilingstartheight = sec->ceilingheight; thwomp->ceilingstartheight = sec->ceilingheight;
thwomp->delay = 1; thwomp->delay = 1;
thwomp->tag = Tag_FGet(&sourceline->tags); thwomp->tag = sourceline->args[0];
thwomp->sound = sound; thwomp->sound = sound;
sec->floordata = thwomp; sec->floordata = thwomp;
@ -7477,7 +7477,7 @@ void T_Scroll(scroll_t *s)
if (!is3dblock) if (!is3dblock)
continue; continue;
TAG_ITER_SECTORS(Tag_FGet(&line->tags), sect) TAG_ITER_SECTORS(line->args[0], sect)
{ {
sector_t *psec; sector_t *psec;
psec = sectors + sect; psec = sectors + sect;
@ -7552,7 +7552,7 @@ void T_Scroll(scroll_t *s)
if (!is3dblock) if (!is3dblock)
continue; continue;
TAG_ITER_SECTORS(Tag_FGet(&line->tags), sect) TAG_ITER_SECTORS(line->args[0], sect)
{ {
sector_t *psec; sector_t *psec;
psec = sectors + sect; psec = sectors + sect;
@ -7828,7 +7828,7 @@ void T_Disappear(disappear_t *d)
{ {
ffloor_t *rover; ffloor_t *rover;
register INT32 s; register INT32 s;
mtag_t afftag = Tag_FGet(&lines[d->affectee].tags); mtag_t afftag = lines[d->affectee].args[0];
TAG_ITER_SECTORS(afftag, s) TAG_ITER_SECTORS(afftag, s)
{ {