lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Standards

This commit is contained in:
Tatsuru 2020-02-18 22:19:09 -03:00
parent 431206ebee
commit c76a8e8a58
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/p_mobj.c
View File

@ -7996,16 +7996,6 @@ static void P_MobjSceneryThink(mobj_t *mobj)
mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT)); mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
} }
break; break;
case MT_VWREF:
case MT_VWREB:
{
INT32 strength;
++mobj->movedir;
mobj->frame &= ~FF_TRANSMASK;
strength = min(mobj->fuse, (INT32)mobj->movedir)*3;
if (strength < 10)
mobj->frame |= ((10 - strength) << (FF_TRANSSHIFT));
}
case MT_FINISHFLAG: case MT_FINISHFLAG:
{ {
if (!mobj->target || mobj->target->player->playerstate == PST_DEAD || !cv_exitmove.value) if (!mobj->target || mobj->target->player->playerstate == PST_DEAD || !cv_exitmove.value)
@ -8019,19 +8009,34 @@ static void P_MobjSceneryThink(mobj_t *mobj)
else else
mobj->flags2 &= ~MF2_DONTDRAW; mobj->flags2 &= ~MF2_DONTDRAW;
fixed_t radius = FixedMul(10*mobj->info->speed, mobj->target->scale);
mobj->angle += FixedAngle(mobj->info->speed);
angle_t fa = mobj->angle >> ANGLETOFINESHIFT;
P_UnsetThingPosition(mobj); P_UnsetThingPosition(mobj);
{
fixed_t radius = FixedMul(10*mobj->info->speed, mobj->target->scale);
angle_t fa;
mobj->angle += FixedAngle(mobj->info->speed);
fa = mobj->angle >> ANGLETOFINESHIFT;
mobj->x = mobj->target->x + FixedMul(FINECOSINE(fa),radius); mobj->x = mobj->target->x + FixedMul(FINECOSINE(fa),radius);
mobj->y = mobj->target->y + FixedMul(FINESINE(fa),radius); mobj->y = mobj->target->y + FixedMul(FINESINE(fa),radius);
mobj->z = mobj->target->z + mobj->target->height/2; mobj->z = mobj->target->z + mobj->target->height/2;
}
P_SetThingPosition(mobj); P_SetThingPosition(mobj);
P_SetScale(mobj, mobj->target->scale); P_SetScale(mobj, mobj->target->scale);
} }
break;
case MT_VWREF:
case MT_VWREB:
{
INT32 strength;
++mobj->movedir;
mobj->frame &= ~FF_TRANSMASK;
strength = min(mobj->fuse, (INT32)mobj->movedir)*3;
if (strength < 10)
mobj->frame |= ((10 - strength) << (FF_TRANSSHIFT));
}
/* FALLTHRU */ /* FALLTHRU */
default: default:
if (mobj->fuse) if (mobj->fuse)