Merge branch 'airbob-fix-backport' into 'next'

Airbob fix backport

See merge request STJr/SRB2!219
This commit is contained in:
Monster Iestyn 2017-12-27 15:46:39 -05:00
commit a87eec89ff

View file

@ -5216,13 +5216,11 @@ static void P_AddOldAirbob(sector_t *sec, line_t *sourceline, boolean noadjust)
airbob->vars[2] = FRACUNIT; airbob->vars[2] = FRACUNIT;
if (noadjust) if (noadjust)
{
airbob->vars[7] = airbob->sector->ceilingheight-16*FRACUNIT; airbob->vars[7] = airbob->sector->ceilingheight-16*FRACUNIT;
airbob->vars[6] = airbob->vars[7]
- (sec->ceilingheight - sec->floorheight);
}
else else
airbob->vars[7] = airbob->sector->ceilingheight - P_AproxDistance(sourceline->dx, sourceline->dy); airbob->vars[7] = airbob->sector->ceilingheight - P_AproxDistance(sourceline->dx, sourceline->dy);
airbob->vars[6] = airbob->vars[7]
- (sec->ceilingheight - sec->floorheight);
airbob->vars[3] = airbob->vars[2]; airbob->vars[3] = airbob->vars[2];