stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'op-nightsbumper' into 'master'

Browse source 
NiGHTS Objectplace: Preserve MT_NIGHTSBUMPER vertical angle upon WRITETHINGS

See merge request STJr/SRB2Internal!137
This commit is contained in:
Digiku 2018-04-06 20:21:25 -04:00
commit e1cd6357cc
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_mobj.c
View file

@ -10060,9 +10060,6 @@ domaceagain:
// the bumper in 30 degree increments. // the bumper in 30 degree increments.
mobj->threshold = (mthing->options & 15) % 12; // It loops over, etc mobj->threshold = (mthing->options & 15) % 12; // It loops over, etc
P_SetMobjState(mobj, mobj->info->spawnstate+mobj->threshold); P_SetMobjState(mobj, mobj->info->spawnstate+mobj->threshold);
// you can shut up now, OBJECTFLIP. And all of the other options, for that matter.
mthing->options &= ~0xF;
break; break;
case MT_EGGCAPSULE: case MT_EGGCAPSULE:
if (mthing->angle <= 0) if (mthing->angle <= 0)
@ -10264,6 +10261,14 @@ domaceagain:
} }
} }
// ignore MTF_ flags and return early
if (i == MT_NIGHTSBUMPER)
{
mobj->angle = FixedAngle(mthing->angle*FRACUNIT);
mthing->mobj = mobj;
return;
}
mobj->angle = FixedAngle(mthing->angle*FRACUNIT); mobj->angle = FixedAngle(mthing->angle*FRACUNIT);
if ((mthing->options & MTF_AMBUSH) if ((mthing->options & MTF_AMBUSH)