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

Replace sectornum/rovernum index vars with ffloor pointers

Browse source
This commit is contained in:
mazmazz 2018-09-09 23:12:37 -04:00
parent d01193df80
commit f33f9dd284
3 changed files with 62 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/p_map.c
View file

@ -52,8 +52,7 @@ fixed_t tmfloorz, tmceilingz;
static fixed_t tmdropoffz, tmdrpoffceilz; // drop-off floor/ceiling heights static fixed_t tmdropoffz, tmdrpoffceilz; // drop-off floor/ceiling heights
mobj_t *tmfloorthing; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector mobj_t *tmfloorthing; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector
mobj_t *tmhitthing; // the solid thing you bumped into (for collisions) mobj_t *tmhitthing; // the solid thing you bumped into (for collisions)
//ffloor_t *tmfloorrover, *tmceilingrover; // unused for now ffloor_t *tmfloorrover, *tmceilingrover;
size_t tmfloor_sectornum, tmfloor_rovernum, tmceiling_sectornum, tmceiling_rovernum;
#ifdef ESLOPE #ifdef ESLOPE
pslope_t *tmfloorslope, *tmceilingslope; pslope_t *tmfloorslope, *tmceilingslope;
#endif #endif
@ -1419,8 +1418,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->z + thing->height > tmfloorz) if (thing->z + thing->height > tmfloorz)
{ {
tmfloorz = thing->z + thing->height; tmfloorz = thing->z + thing->height;
// tmfloorrover = NULL; tmfloorrover = NULL;
tmfloor_sectornum = tmfloor_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = NULL; tmfloorslope = NULL;
#endif #endif
@ -1441,8 +1439,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return false; return false;
tmfloorz = tmceilingz = topz; // block while in air tmfloorz = tmceilingz = topz; // block while in air
// tmceilingrover = NULL; tmceilingrover = NULL;
tmceiling_sectornum = tmceiling_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmceilingslope = NULL; tmceilingslope = NULL;
#endif #endif
@ -1451,8 +1448,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height) else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height)
{ {
tmceilingz = topz; tmceilingz = topz;
// tmceilingrover = NULL; tmceilingrover = NULL;
tmceiling_sectornum = tmceiling_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmceilingslope = NULL; tmceilingslope = NULL;
#endif #endif
@ -1469,8 +1465,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->z < tmceilingz) if (thing->z < tmceilingz)
{ {
tmceilingz = thing->z; tmceilingz = thing->z;
// tmceilingrover = NULL; tmceilingrover = NULL;
tmceiling_sectornum = tmceiling_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmceilingslope = NULL; tmceilingslope = NULL;
#endif #endif
@ -1491,8 +1486,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return false; return false;
tmfloorz = tmceilingz = topz; // block while in air tmfloorz = tmceilingz = topz; // block while in air
// tmfloorrover = NULL; tmfloorrover = NULL;
tmfloor_sectornum = tmfloor_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = NULL; tmfloorslope = NULL;
#endif #endif
@ -1501,8 +1495,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z) else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z)
{ {
tmfloorz = topz; tmfloorz = topz;
// tmfloorrover = NULL; tmfloorrover = NULL;
tmfloor_sectornum = tmfloor_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = NULL; tmfloorslope = NULL;
#endif #endif
@ -1654,8 +1647,7 @@ static boolean PIT_CheckLine(line_t *ld)
{ {
tmceilingz = opentop; tmceilingz = opentop;
ceilingline = ld; ceilingline = ld;
// tmceilingrover = NULL; tmceilingrover = NULL;
tmceiling_sectornum = tmceiling_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmceilingslope = opentopslope; tmceilingslope = opentopslope;
#endif #endif
@ -1664,8 +1656,7 @@ static boolean PIT_CheckLine(line_t *ld)
if (openbottom > tmfloorz) if (openbottom > tmfloorz)
{ {
tmfloorz = openbottom; tmfloorz = openbottom;
// tmfloorrover = NULL; tmfloorrover = NULL;
tmfloor_sectornum = tmfloor_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = openbottomslope; tmfloorslope = openbottomslope;
#endif #endif
@ -1747,10 +1738,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
// will adjust them. // will adjust them.
tmfloorz = tmdropoffz = P_GetFloorZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->floorheight; tmfloorz = tmdropoffz = P_GetFloorZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->floorheight;
tmceilingz = P_GetCeilingZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->ceilingheight; tmceilingz = P_GetCeilingZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->ceilingheight;
// tmfloorrover = NULL; tmfloorrover = NULL;
tmfloor_sectornum = tmfloor_rovernum = 0; tmceilingrover = NULL;
// tmceilingrover = NULL;
tmceiling_sectornum = tmceiling_rovernum = 0;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = newsubsec->sector->f_slope; tmfloorslope = newsubsec->sector->f_slope;
tmceilingslope = newsubsec->sector->c_slope; tmceilingslope = newsubsec->sector->c_slope;
@ -1798,9 +1787,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{ {
if (tmfloorz < topheight - sinklevel) { if (tmfloorz < topheight - sinklevel) {
tmfloorz = topheight - sinklevel; tmfloorz = topheight - sinklevel;
// tmfloorrover = rover; tmfloorrover = rover;
tmfloor_sectornum = newsubsec->sector - sectors;
tmfloor_rovernum = rovernum;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = *rover->t_slope; tmfloorslope = *rover->t_slope;
#endif #endif
@ -1810,9 +1797,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{ {
if (tmceilingz > bottomheight + sinklevel) { if (tmceilingz > bottomheight + sinklevel) {
tmceilingz = bottomheight + sinklevel; tmceilingz = bottomheight + sinklevel;
// tmceilingrover = rover; tmceilingrover = rover;
tmceiling_sectornum = newsubsec->sector - sectors;
tmceiling_rovernum = rovernum;
#ifdef ESLOPE #ifdef ESLOPE
tmceilingslope = *rover->b_slope; tmceilingslope = *rover->b_slope;
#endif #endif
@ -1841,9 +1826,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{ {
if (tmfloorz < thing->z) { if (tmfloorz < thing->z) {
tmfloorz = thing->z; tmfloorz = thing->z;
// tmfloorrover = rover; tmfloorrover = rover;
tmfloor_sectornum = newsubsec->sector - sectors;
tmfloor_rovernum = rovernum;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = NULL; tmfloorslope = NULL;
#endif #endif
@ -1863,9 +1846,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
&& !(rover->flags & FF_REVERSEPLATFORM)) && !(rover->flags & FF_REVERSEPLATFORM))
{ {
tmfloorz = tmdropoffz = topheight; tmfloorz = tmdropoffz = topheight;
// tmfloorrover = rover; tmfloorrover = rover;
tmfloor_sectornum = newsubsec->sector - sectors;
tmfloor_rovernum = rovernum;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = *rover->t_slope; tmfloorslope = *rover->t_slope;
#endif #endif
@ -1875,9 +1856,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE))) && !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
{ {
tmceilingz = tmdrpoffceilz = bottomheight; tmceilingz = tmdrpoffceilz = bottomheight;
// tmceilingrover = rover; tmceilingrover = rover;
tmceiling_sectornum = newsubsec->sector - sectors;
tmceiling_rovernum = rovernum;
#ifdef ESLOPE #ifdef ESLOPE
tmceilingslope = *rover->b_slope; tmceilingslope = *rover->b_slope;
#endif #endif
@ -2375,12 +2354,8 @@ boolean PIT_PushableMoved(mobj_t *thing)
mobj_t *oldthing = tmthing; mobj_t *oldthing = tmthing;
line_t *oldceilline = ceilingline; line_t *oldceilline = ceilingline;
line_t *oldblockline = blockingline; line_t *oldblockline = blockingline;
// ffloor_t *oldflrrover = tmfloorrover; ffloor_t *oldflrrover = tmfloorrover;
// ffloor_t *oldceilrover = tmceilingrover; ffloor_t *oldceilrover = tmceilingrover;
size_t oldflrrover_sectornum = tmfloor_sectornum;
size_t oldflrrover_ffloornum = tmfloor_rovernum;
size_t oldceilrover_sectornum = tmceiling_sectornum;
size_t oldceilrover_ffloornum = tmceiling_rovernum;
#ifdef ESLOPE #ifdef ESLOPE
pslope_t *oldfslope = tmfloorslope; pslope_t *oldfslope = tmfloorslope;
pslope_t *oldcslope = tmceilingslope; pslope_t *oldcslope = tmceilingslope;
@ -2397,12 +2372,8 @@ boolean PIT_PushableMoved(mobj_t *thing)
P_SetTarget(&tmthing, oldthing); P_SetTarget(&tmthing, oldthing);
ceilingline = oldceilline; ceilingline = oldceilline;
blockingline = oldblockline; blockingline = oldblockline;
// tmfloorrover = oldflrrover; tmfloorrover = oldflrrover;
// tmceilingrover = oldceilrover; tmceilingrover = oldceilrover;
tmfloor_sectornum = oldflrrover_sectornum;
tmfloor_rovernum = oldflrrover_ffloornum;
tmceiling_sectornum = oldceilrover_sectornum;
tmceiling_rovernum = oldceilrover_ffloornum;
#ifdef ESLOPE #ifdef ESLOPE
tmfloorslope = oldfslope; tmfloorslope = oldfslope;
tmceilingslope = oldcslope; tmceilingslope = oldcslope;
@ -2722,8 +2693,8 @@ static boolean P_ThingHeightClip(mobj_t *thing)
{ {
boolean floormoved; boolean floormoved;
fixed_t oldfloorz = thing->floorz; fixed_t oldfloorz = thing->floorz;
size_t oldfloor_sectornum = thing->floor_sectornum, oldfloor_rovernum = thing->floor_rovernum; ffloor_t *oldfloorrover = thing->floorrover;
size_t oldceil_sectornum = thing->ceiling_sectornum, oldceil_rovernum = thing->ceiling_rovernum; ffloor_t *oldceilingrover = thing->ceilingrover;
boolean onfloor = P_IsObjectOnGround(thing);//(thing->z <= thing->floorz); boolean onfloor = P_IsObjectOnGround(thing);//(thing->z <= thing->floorz);
ffloor_t *rover = NULL; ffloor_t *rover = NULL;
@ -2740,10 +2711,8 @@ static boolean P_ThingHeightClip(mobj_t *thing)
thing->floorz = tmfloorz; thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz; thing->ceilingz = tmceilingz;
thing->floor_sectornum = tmfloor_sectornum; thing->floorrover = tmfloorrover;
thing->floor_rovernum = tmfloor_rovernum; thing->ceilingrover = tmceilingrover;
thing->ceiling_sectornum = tmceiling_sectornum;
thing->ceiling_rovernum = tmceiling_rovernum;
// Ugly hack?!?! As long as just ceilingz is the lowest, // Ugly hack?!?! As long as just ceilingz is the lowest,
// you'll still get crushed, right? // you'll still get crushed, right?
@ -2752,19 +2721,7 @@ static boolean P_ThingHeightClip(mobj_t *thing)
if (onfloor && !(thing->flags & MF_NOGRAVITY) && floormoved) if (onfloor && !(thing->flags & MF_NOGRAVITY) && floormoved)
{ {
size_t old_sectornum = (thing->eflags & MFE_VERTICALFLIP) ? oldceil_sectornum : oldfloor_sectornum; rover = (thing->eflags & MFE_VERTICALFLIP) ? oldceilingrover : oldfloorrover;
size_t old_rovernum = (thing->eflags & MFE_VERTICALFLIP) ? oldceil_rovernum : oldfloor_rovernum;
// Find FOF referenced by floorz
if (old_sectornum)
{
size_t rovernum = 0;
for (rover = sectors[old_sectornum].ffloors; rover; rover = rover->next)
{
if (rovernum == old_rovernum)
break;
rovernum++;
}
}
// Match the Thing's old floorz to an FOF and check for FF_EXISTS // Match the Thing's old floorz to an FOF and check for FF_EXISTS
// If ~FF_EXISTS, don't set mobj Z. // If ~FF_EXISTS, don't set mobj Z.

6
src/p_mobj.h
View file

@ -282,10 +282,8 @@ typedef struct mobj_s
// The closest interval over all contacted sectors (or things). // The closest interval over all contacted sectors (or things).
fixed_t floorz; // Nearest floor below. fixed_t floorz; // Nearest floor below.
fixed_t ceilingz; // Nearest ceiling above. fixed_t ceilingz; // Nearest ceiling above.
size_t floor_sectornum; // FOF referred by floorz struct ffloor_s *floorrover; // FOF referred by floorz
size_t floor_rovernum; // FOF referred by floorz struct ffloor_s *ceilingrover; // FOF referred by ceilingz
size_t ceiling_sectornum; // FOF referred by ceilingz
size_t ceiling_rovernum; // FOF referred by ceilingz
// For movement checking. // For movement checking.
fixed_t radius; fixed_t radius;

48
src/p_saveg.c
View file

@ -1192,10 +1192,13 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, mobj->z); // Force this so 3dfloor problems don't arise. WRITEFIXED(save_p, mobj->z); // Force this so 3dfloor problems don't arise.
WRITEFIXED(save_p, mobj->floorz); WRITEFIXED(save_p, mobj->floorz);
WRITEFIXED(save_p, mobj->ceilingz); WRITEFIXED(save_p, mobj->ceilingz);
WRITEUINT32(save_p, (UINT32)mobj->floor_sectornum);
WRITEUINT32(save_p, (UINT32)mobj->floor_rovernum); // \todo netsync for floorrover
WRITEUINT32(save_p, (UINT32)mobj->ceiling_sectornum);
WRITEUINT32(save_p, (UINT32)mobj->ceiling_rovernum); // WRITEUINT32(save_p, (UINT32)mobj->floor_sectornum);
// WRITEUINT32(save_p, (UINT32)mobj->floor_rovernum);
// WRITEUINT32(save_p, (UINT32)mobj->ceiling_sectornum);
// WRITEUINT32(save_p, (UINT32)mobj->ceiling_rovernum);
if (diff & MD_SPAWNPOINT) if (diff & MD_SPAWNPOINT)
{ {
@ -1993,7 +1996,7 @@ static void LoadMobjThinker(actionf_p1 thinker)
UINT16 diff2; UINT16 diff2;
INT32 i; INT32 i;
fixed_t z, floorz, ceilingz; fixed_t z, floorz, ceilingz;
size_t floor_sectornum, floor_rovernum, ceiling_sectornum, ceiling_rovernum; //size_t floor_sectornum, floor_rovernum, ceiling_sectornum, ceiling_rovernum;
diff = READUINT32(save_p); diff = READUINT32(save_p);
if (diff & MD_MORE) if (diff & MD_MORE)
@ -2006,10 +2009,26 @@ static void LoadMobjThinker(actionf_p1 thinker)
z = READFIXED(save_p); // Force this so 3dfloor problems don't arise. z = READFIXED(save_p); // Force this so 3dfloor problems don't arise.
floorz = READFIXED(save_p); floorz = READFIXED(save_p);
ceilingz = READFIXED(save_p); ceilingz = READFIXED(save_p);
floor_sectornum = (size_t)READUINT32(save_p);
floor_rovernum = (size_t)READUINT32(save_p); // \todo netsync for floorrover
ceiling_sectornum = (size_t)READUINT32(save_p); #if 0
ceiling_rovernum = (size_t)READUINT32(save_p); // Find FOF referenced by floorz
if (old_sectornum)
{
size_t rovernum = 0;
for (rover = sectors[old_sectornum].ffloors; rover; rover = rover->next)
{
if (rovernum == old_rovernum)
break;
rovernum++;
}
}
#endif
// floor_sectornum = (size_t)READUINT32(save_p);
// floor_rovernum = (size_t)READUINT32(save_p);
// ceiling_sectornum = (size_t)READUINT32(save_p);
// ceiling_rovernum = (size_t)READUINT32(save_p);
if (diff & MD_SPAWNPOINT) if (diff & MD_SPAWNPOINT)
{ {
@ -2035,10 +2054,13 @@ static void LoadMobjThinker(actionf_p1 thinker)
mobj->z = z; mobj->z = z;
mobj->floorz = floorz; mobj->floorz = floorz;
mobj->ceilingz = ceilingz; mobj->ceilingz = ceilingz;
mobj->floor_sectornum = floor_sectornum;
mobj->floor_rovernum = floor_rovernum; // \todo netsync for floorrover
mobj->ceiling_sectornum = ceiling_sectornum;
mobj->ceiling_rovernum = ceiling_rovernum; // mobj->floor_sectornum = floor_sectornum;
// mobj->floor_rovernum = floor_rovernum;
// mobj->ceiling_sectornum = ceiling_sectornum;
// mobj->ceiling_rovernum = ceiling_rovernum;
if (diff & MD_TYPE) if (diff & MD_TYPE)
mobj->type = READUINT32(save_p); mobj->type = READUINT32(save_p);