teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-04 23:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- cleaned up nextsectorneighborz, added a safe variant and use this in all places where the sector pointer is not validated.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-11 13:58:37 +01:00
parent 18bd2e4d07
commit d8ccfa1a5f
7 changed files with 59 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/build/include/build.h
View file

@ -368,17 +368,11 @@ inline walltype* lastwall(walltype* point)
return &wall[lastwall(wall.IndexOf(point))];
}
int32_t nextsectorneighborz(int16_t sectnum, int32_t refz, int16_t topbottom, int16_t direction);
inline sectortype* nextsectorneighborzptr(int16_t sectnum, int32_t refz, int16_t topbottom, int16_t direction)
sectortype* nextsectorneighborzptr(sectortype* sectp, int refz, int topbottom, int direction);
inline sectortype* safenextsectorneighborzptr(sectortype* sectp, int refz, int topbottom, int direction)
{
auto sect = nextsectorneighborz(sectnum, refz, topbottom, direction);
return sect == -1? nullptr : &sector[sect];
}
inline sectortype* nextsectorneighborzptr(sectortype* sectp, int32_t refz, int16_t topbottom, int16_t direction)
{
auto sect = nextsectorneighborz(sector.IndexOf(sectp), refz, topbottom, direction);
return sect == -1? nullptr : &sector[sect];
auto sect = nextsectorneighborzptr(sectp, refz, topbottom, direction);
return sect == nullptr ? sectp : sect;
}
int32_t getceilzofslopeptr(usectorptr_t sec, int32_t dax, int32_t day) ATTRIBUTE((nonnull(1)));

25
source/build/src/engine.cpp
View file

@ -474,22 +474,18 @@ int32_t spriteheightofsptr(uspriteptr_t spr, int32_t *height, int32_t alsotileyo
//
// -1: ceiling or up
// 1: floor or down
int32_t nextsectorneighborz(int16_t sectnum, int32_t refz, int16_t topbottom, int16_t direction)
sectortype* nextsectorneighborzptr(sectortype* sectp, int refz, int topbottom, int direction)
{
int32_t nextz = (direction==1) ? INT32_MAX : INT32_MIN;
int32_t sectortouse = -1;
int nextz = (direction==1) ? INT32_MAX : INT32_MIN;
sectortype* sectortouse = nullptr;
auto wal = (uwallptr_t)sector[sectnum].firstWall();
int32_t i = sector[sectnum].wallnum;
do
for(auto& wal : wallsofsector(sectp))
{
const int32_t ns = wal->nextsector;
if (ns >= 0)
if (wal.twoSided())
{
const int32_t testz = (topbottom == 1) ?
sector[ns].floorz : sector[ns].ceilingz;
auto ns = wal.nextSector();
const int32_t testz = (topbottom == 1) ? ns->floorz : ns->ceilingz;
const int32_t update = (direction == 1) ?
(nextz > testz && testz > refz) :
@ -501,12 +497,7 @@ int32_t nextsectorneighborz(int16_t sectnum, int32_t refz, int16_t topbottom, in
sectortouse = ns;
}
}
wal++;
i--;
}
while (i != 0);
return sectortouse;
}

2
source/games/duke/src/bowling.cpp
View file

@ -74,7 +74,7 @@ int pinsectorresetup(sectortype* sec)
if (j == -1)
{
j = nextsectorneighborzptr(sec, sec->ceilingz, -1, -1)->ceilingz;
j = safenextsectorneighborzptr(sec, sec->ceilingz, -1, -1)->ceilingz;
setanimation(sec, anim_ceilingz, sec, j, 64);
return 1;
}

12
source/games/duke/src/sectors.cpp
View file

@ -676,9 +676,9 @@ static void handle_st29(sectortype* sptr, DDukeActor* actor)
int j;
if (sptr->lotag & 0x8000)
j = nextsectorneighborzptr(sptr, sptr->ceilingz, 1, 1)->floorz;
j = safenextsectorneighborzptr(sptr, sptr->ceilingz, 1, 1)->floorz;
else
j = nextsectorneighborzptr(sptr, sptr->ceilingz, -1, -1)->ceilingz;
j = safenextsectorneighborzptr(sptr, sptr->ceilingz, -1, -1)->ceilingz;
DukeStatIterator it(STAT_EFFECTOR);
while (auto act2 = it.Next())
@ -757,14 +757,14 @@ static void handle_st21(sectortype* sptr, DDukeActor* actor)
if (i >= 0)
{
if (animategoal[i] == sptr->ceilingz)
animategoal[i] = nextsectorneighborzptr(sptr, sptr->ceilingz, 1, 1)->floorz;
animategoal[i] = safenextsectorneighborzptr(sptr, sptr->ceilingz, 1, 1)->floorz;
else animategoal[i] = sptr->ceilingz;
j = animategoal[i];
}
else
{
if (sptr->ceilingz == sptr->floorz)
j = nextsectorneighborzptr(sptr, sptr->ceilingz, 1, 1)->floorz;
j = safenextsectorneighborzptr(sptr, sptr->ceilingz, 1, 1)->floorz;
else j = sptr->ceilingz;
sptr->lotag ^= 0x8000;
@ -791,9 +791,9 @@ static void handle_st22(sectortype* sptr, DDukeActor* actor)
}
else
{
q = nextsectorneighborzptr(sptr, sptr->floorz, 1, 1)->floorz;
q = safenextsectorneighborzptr(sptr, sptr->floorz, 1, 1)->floorz;
j = setanimation(sptr, anim_floorz, sptr, q, sptr->extra);
q = nextsectorneighborzptr(sptr, sptr->ceilingz, -1, -1)->ceilingz;
q = safenextsectorneighborzptr(sptr, sptr->ceilingz, -1, -1)->ceilingz;
j = setanimation(sptr, anim_ceilingz, sptr, q, sptr->extra);
}

4
source/games/duke/src/spawn.cpp
View file

@ -769,8 +769,8 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
case SE_17_WARP_ELEVATOR:
{
t[2] = sectp->floorz; //Stopping loc
t[3] = nextsectorneighborzptr(sectp, sectp->floorz, -1, -1)->ceilingz;
t[4] = nextsectorneighborzptr(sectp, sectp->ceilingz, 1, 1)->floorz;
t[3] = safenextsectorneighborzptr(sectp, sectp->floorz, -1, -1)->ceilingz;
t[4] = safenextsectorneighborzptr(sectp, sectp->ceilingz, 1, 1)->floorz;
if (numplayers < 2)
{

74
source/games/exhumed/src/runlist.cpp
View file

@ -615,7 +615,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
This function searches z-coordinates of neighboring sectors to find the
closest (next) ceiling starting at the given z-coordinate (thez).
*/
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
int nElev = BuildElevC(0, nChannel, pSector, FindWallSprites(pSector), nSpeed * 100, nSpeed * 100, 2, pSector->floorz, nextSectorP->ceilingz);
@ -634,7 +634,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 2: // Floor Doom door
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
int nElev = BuildElevF(nChannel, pSector, FindWallSprites(pSector), nSpeed * 100, nSpeed * 100, 2, pSector->ceilingz, nextSectorP->floorz);
@ -683,7 +683,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 5: // Permanent floor raise
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz + 1, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz + 1, -1, -1);
if (nextSectorP == nullptr) break;
int nElev = BuildElevF(nChannel, pSector, FindWallSprites(pSector), nSpeed * 100, nSpeed * 100, 2, pSector->floorz, nextSectorP->ceilingz);
@ -694,7 +694,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 6: // Touchplate floor lower, single
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
if (nextSectorP == nullptr) break;
@ -712,7 +712,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 7: // Touchplate floor lower, multiple
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -732,7 +732,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 8: // Permanent floor lower
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -744,7 +744,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 9: // Switch activated lift down
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -760,7 +760,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 10: // Touchplate Floor Raise
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
if (nextSectorP == nullptr) break;
@ -789,7 +789,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
*/
int zVal = 0;
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
if (nextSectorP != nullptr) {
zVal = nextSectorP->floorz;
}
@ -809,7 +809,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
*/
int zVal = 0;
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
if (nextSectorP != nullptr) {
zVal = nextSectorP->floorz;
}
@ -833,7 +833,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
*/
int zVal = 0;
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP != nullptr) {
zVal = nextSectorP->floorz;
}
@ -850,7 +850,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 15: // Sector raise/lower
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
if (nextSectorP == nullptr) break;
@ -925,7 +925,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
*/
int zVal = 0;
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP) {
zVal = nextSectorP->floorz;
}
@ -942,7 +942,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 24: // Ceiling door, channel trigger only
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -958,7 +958,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 25:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -974,7 +974,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 26:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -990,7 +990,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 27:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1006,7 +1006,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 28:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1022,7 +1022,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 31: // Touchplate
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1038,7 +1038,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 32:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1050,7 +1050,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 33: // Ceiling Crusher
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -1062,7 +1062,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 34: // Triggerable Ceiling Crusher(Inactive)
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -1088,7 +1088,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 37:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1100,7 +1100,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 39: // Touchplate
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1163,7 +1163,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
*/
int zVal = 0;
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, 1);
if (nextSectorP != nullptr) {
zVal = nextSectorP->ceilingz;
}
@ -1176,7 +1176,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 49:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -1188,7 +1188,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 50: // Floor lower / raise
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1264,7 +1264,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 54:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -1280,7 +1280,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 55:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -1296,7 +1296,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 56:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;
@ -1308,7 +1308,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 57:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1333,7 +1333,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
nEnergyChan = nChannel;
}
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
int nElev = BuildElevC(0, nChannel, pSector, FindWallSprites(pSector), nSpeed * 100, nSpeed * 100, 2, pSector->floorz, nextSectorP->ceilingz);
@ -1344,7 +1344,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 59:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1369,7 +1369,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
while (1)
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, -1);
if (nextSectorP == nullptr || var_1C >= 8) {
break;
}
@ -1393,7 +1393,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
while (1)
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr || var_20 >= 8) {
break;
}
@ -1419,7 +1419,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 68:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->floorz, 1, 1);
if (nextSectorP == nullptr) break;
@ -1432,7 +1432,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
case 70:
case 71:
{
auto nextSectorP = nextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
auto nextSectorP = safenextsectorneighborzptr(pSector, pSector->ceilingz, -1, -1);
if (nextSectorP == nullptr) break;

2
source/games/sw/src/sector.cpp
View file

@ -633,7 +633,7 @@ void DoSpringBoardDown(void)
{
int destz;
destz = nextsectorneighborzptr(sbp->sectp, sbp->sectp->floorz, 1, 1)->floorz;
destz = safenextsectorneighborzptr(sbp->sectp, sbp->sectp->floorz, 1, 1)->floorz;
AnimSet(ANIM_Floorz, sbp->sectp, destz, 256);