AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

use the Vanilla P_UnsetThingPosition()/P_SetThingPosition() for Boom and earlier

Browse Source
This commit is contained in:
Fabian Greffrath 2025-05-08 14:23:11 +02:00
parent 7530deae79
commit f3e3552bc9
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/p_maputl.c
View File

@ -254,9 +254,30 @@ void P_UnsetThingPosition (mobj_t *thing)
// at time of unlinking, assuming it was the same position as during // at time of unlinking, assuming it was the same position as during
// linking. // linking.
#ifndef MBF_STRICT
if (demo_version < DV_MBF)
{
if (thing->bnext) // unlink from block map
thing->bnext->bprev = thing->bprev;
if (thing->bprev)
((mobj_t *)thing->bprev)->bnext = thing->bnext;
else
{
int blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
int blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
if (blockx>=0 && blockx < bmapwidth &&
blocky>=0 && blocky <bmapheight)
blocklinks[blocky*bmapwidth+blockx] = thing->bnext;
}
}
else
#endif
{
mobj_t *bnext, **bprev = thing->bprev; mobj_t *bnext, **bprev = thing->bprev;
if (bprev && (*bprev = bnext = thing->bnext)) // unlink from block map if (bprev && (*bprev = bnext = thing->bnext)) // unlink from block map
bnext->bprev = bprev; bnext->bprev = bprev;
}
} }
} }
@ -317,10 +338,22 @@ void P_SetThingPosition(mobj_t *thing)
// pointers, allows head nodes to be treated like everything else // pointers, allows head nodes to be treated like everything else
mobj_t **link = &blocklinks[blocky*bmapwidth+blockx]; mobj_t **link = &blocklinks[blocky*bmapwidth+blockx];
#ifndef MBF_STRICT
if (demo_version < DV_MBF)
{
thing->bprev = NULL;
thing->bnext = *link;
if (*link)
(*link)->bprev = (mobj_t**)thing;
}
else
#endif
{
mobj_t *bnext = *link; mobj_t *bnext = *link;
if ((thing->bnext = bnext)) if ((thing->bnext = bnext))
bnext->bprev = &thing->bnext; bnext->bprev = &thing->bnext;
thing->bprev = link; thing->bprev = link;
}
*link = thing; *link = thing;
} }
else // thing is off the map else // thing is off the map