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

Resolve merge conflicts

Browse source
This commit is contained in:
lachwright 2019-09-30 03:07:03 +08:00
commit 6c0e4a154d
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -8605,6 +8605,7 @@ struct {
{"CR_MINECART",CR_MINECART}, {"CR_MINECART",CR_MINECART},
{"CR_ROLLOUT", CR_ROLLOUT}, {"CR_ROLLOUT", CR_ROLLOUT},
{"CR_PTERABYTE",CR_PTERABYTE}, {"CR_PTERABYTE",CR_PTERABYTE},
// Ring weapons (ringweapons_t) // Ring weapons (ringweapons_t)
// Useful for A_GiveWeapon // Useful for A_GiveWeapon
{"RW_AUTO",RW_AUTO}, {"RW_AUTO",RW_AUTO},

6
src/p_mobj.c
View file

@ -9107,6 +9107,12 @@ void P_MobjThinker(mobj_t *mobj)
if (!mobj->target) if (!mobj->target)
break; break;
if (mobj->target->player->powers[pw_flashing])
{
P_SetTarget(&mobj->target, NULL);
break;
}
vdist = mobj->z - mobj->target->z - mobj->target->height; vdist = mobj->z - mobj->target->z - mobj->target->height;
if (vdist <= 0) if (vdist <= 0)
{ {

6
src/p_user.c
View file

@ -11930,7 +11930,7 @@ void P_PlayerAfterThink(player_t *player)
if (ptera->health <= 0) if (ptera->health <= 0)
goto dropoff; goto dropoff;
if (P_MobjAboveLava(ptera)) if (P_MobjAboveLava(ptera) && ptera->movefactor <= 3*TICRATE - 10)
goto dropoff; goto dropoff;
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
@ -11939,7 +11939,7 @@ void P_PlayerAfterThink(player_t *player)
&& (ptera->eflags & MFE_VERTICALFLIP)) // Reverse gravity check for the carrier - Flame && (ptera->eflags & MFE_VERTICALFLIP)) // Reverse gravity check for the carrier - Flame
player->mo->z = ptera->z + ptera->height + FixedMul(FRACUNIT, player->mo->scale); player->mo->z = ptera->z + ptera->height + FixedMul(FRACUNIT, player->mo->scale);
if (ptera->ceilingz - ptera->z > spawnpoint->ceilingz - spawnpoint->z + 512*FRACUNIT) if (ptera->ceilingz - ptera->z > spawnpoint->ceilingz - spawnpoint->z + 512*FRACUNIT && ptera->movefactor <= 3 * TICRATE - 10)
goto dropoff; goto dropoff;
} }
else else
@ -11948,7 +11948,7 @@ void P_PlayerAfterThink(player_t *player)
&& !(ptera->eflags & MFE_VERTICALFLIP)) // Correct gravity check for the carrier - Flame && !(ptera->eflags & MFE_VERTICALFLIP)) // Correct gravity check for the carrier - Flame
player->mo->z = ptera->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale); player->mo->z = ptera->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale);
if (ptera->z - ptera->floorz > spawnpoint->z - spawnpoint->floorz + 512 * FRACUNIT) if (ptera->z - ptera->floorz > spawnpoint->z - spawnpoint->floorz + 512 * FRACUNIT && ptera->movefactor <= 3 * TICRATE - 10)
goto dropoff; goto dropoff;
} }