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

Better rollout behavior in lava

Browse source
This commit is contained in:
lachwright 2019-10-07 15:25:32 +08:00
parent bfb9bac5bd
commit 95f6e2008f
3 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -2487,7 +2487,7 @@ state_t states[NUMSTATES] =
// Rollout Rock // Rollout Rock
{SPR_NULL, 0, 1, {A_RolloutSpawn}, 256*FRACUNIT, MT_ROLLOUTROCK, S_ROLLOUTSPAWN}, // S_ROLLOUTSPAWN {SPR_NULL, 0, 1, {A_RolloutSpawn}, 256*FRACUNIT, MT_ROLLOUTROCK, S_ROLLOUTSPAWN}, // S_ROLLOUTSPAWN
{SPR_PUMI, 0, 1, {A_RolloutRock}, 63*FRACUNIT/64, 6*FRACUNIT/10, S_ROLLOUTROCK}, // S_ROLLOUTROCK {SPR_PUMI, 0, 1, {A_RolloutRock}, 63*FRACUNIT/64, 7*FRACUNIT/10, S_ROLLOUTROCK}, // S_ROLLOUTROCK
// RVZ scenery // RVZ scenery
{SPR_JPLA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_BIGFERNLEAF {SPR_JPLA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_BIGFERNLEAF

30
src/p_enemy.c
View file

@ -13958,36 +13958,18 @@ void A_RolloutRock(mobj_t *actor)
UINT8 maxframes = actor->info->reactiontime; UINT8 maxframes = actor->info->reactiontime;
fixed_t pi = (22*FRACUNIT/7); fixed_t pi = (22*FRACUNIT/7);
fixed_t circumference = FixedMul(2 * pi, actor->radius); fixed_t circumference = FixedMul(2 * pi, actor->radius);
fixed_t oldspeed = P_AproxDistance(actor->momx, actor->momy), newspeed, topspeed = actor->info->speed; fixed_t speed = P_AproxDistance(actor->momx, actor->momy), topspeed = actor->info->speed;
boolean inwater = actor->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER); boolean inwater = actor->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER);
actor->friction = FRACUNIT; actor->friction = FRACUNIT;
if (inwater) if (inwater)
{ {
fixed_t height; actor->momz = FixedMul(actor->momz, locvar2);
if (actor->eflags & MFE_VERTICALFLIP)
{
height = actor->waterbottom + (actor->height>>2);
if (actor->z + actor->height > height)
{
actor->z = height;
actor->momz = 0;
}
}
else
{
height = actor->watertop - (actor->height>>2);
if (actor->z < height)
{
actor->z = height;
actor->momz = 0;
}
}
actor->momz += P_MobjFlip(actor) * FixedMul(locvar2, actor->scale); actor->momz += P_MobjFlip(actor) * FixedMul(locvar2, actor->scale);
} }
if (oldspeed > topspeed) if (speed > topspeed)
{ {
actor->momx = FixedMul(FixedDiv(actor->momx, oldspeed), topspeed); actor->momx = FixedMul(FixedDiv(actor->momx, oldspeed), topspeed);
actor->momy = FixedMul(FixedDiv(actor->momy, oldspeed), topspeed); actor->momy = FixedMul(FixedDiv(actor->momy, oldspeed), topspeed);
@ -13996,14 +13978,14 @@ void A_RolloutRock(mobj_t *actor)
actor->momx = FixedMul(actor->momx, locvar1); actor->momx = FixedMul(actor->momx, locvar1);
actor->momy = FixedMul(actor->momy, locvar1); actor->momy = FixedMul(actor->momy, locvar1);
newspeed = P_AproxDistance(actor->momx, actor->momy); speed = P_AproxDistance(actor->momx, actor->momy);
if (newspeed < actor->scale >> 1) if (speed < actor->scale >> 1)
{ {
actor->momx = 0; actor->momx = 0;
actor->momy = 0; actor->momy = 0;
} }
else if (newspeed > actor->scale) else if (speed > actor->scale)
{ {
actor->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy); actor->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy);
actor->movefactor += newspeed; actor->movefactor += newspeed;

5
src/p_user.c
View file

@ -11920,6 +11920,11 @@ void P_PlayerAfterThink(player_t *player)
mo->momy = rock->momy; mo->momy = rock->momy;
mo->momz = 0; mo->momz = 0;
if (player->panim == PA_IDLE && (mo->momx || mo->momy))
{
P_SetPlayerMobjState(player->mo, S_PLAY_WALK);
}
if (player->panim == PA_WALK && mo->tics > walktics) if (player->panim == PA_WALK && mo->tics > walktics)
{ {
mo->tics = walktics; mo->tics = walktics;