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

Remove redundant conditional in P_IsClimbingValid

Browse source
This commit is contained in:
Louis-Antoine 2020-03-22 15:17:16 +01:00
parent 478f0f2059
commit 6ffbc89f42
1 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_map.c
View file

@ -3209,6 +3209,7 @@ static boolean P_IsClimbingValid(player_t *player, angle_t angle)
sector_t *glidesector; sector_t *glidesector;
fixed_t floorz, ceilingz; fixed_t floorz, ceilingz;
mobj_t *mo = player->mo; mobj_t *mo = player->mo;
ffloor_t *rover;
platx = P_ReturnThrustX(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale)); platx = P_ReturnThrustX(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale));
platy = P_ReturnThrustY(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale)); platy = P_ReturnThrustY(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale));
@ -3223,9 +3224,6 @@ static boolean P_IsClimbingValid(player_t *player, angle_t angle)
boolean floorclimb = false; boolean floorclimb = false;
fixed_t topheight, bottomheight; fixed_t topheight, bottomheight;
if (glidesector->ffloors)
{
ffloor_t *rover;
for (rover = glidesector->ffloors; rover; rover = rover->next) for (rover = glidesector->ffloors; rover; rover = rover->next)
{ {
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER)) if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
@ -3258,7 +3256,6 @@ static boolean P_IsClimbingValid(player_t *player, angle_t angle)
if (floorclimb) if (floorclimb)
break; break;
} }
}
if (mo->eflags & MFE_VERTICALFLIP) if (mo->eflags & MFE_VERTICALFLIP)
{ {