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

Merge branch 'a_scaletoground' into 'next'

Browse source 
Fix A_ConnectToGround's Handling of Scaled Mobjs

Closes #1038

See merge request STJr/SRB2!2029
This commit is contained in:
Sal 2023-07-26 12:17:14 +00:00
commit 03ae681714
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/p_enemy.c
View file

@ -12636,8 +12636,7 @@ void A_MineRange(mobj_t *actor)
void A_ConnectToGround(mobj_t *actor)
{
mobj_t *work;
fixed_t workz;
fixed_t workh;
fixed_t endz;
angle_t ang;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
@ -12648,38 +12647,42 @@ void A_ConnectToGround(mobj_t *actor)
if (actor->subsector->sector->ffloors)
P_AdjustMobjFloorZ_FFloors(actor, actor->subsector->sector, 2);
endz = actor->z;
if (actor->flags2 & MF2_OBJECTFLIP)
workz = (actor->z + actor->height) - actor->ceilingz;
actor->z = actor->ceilingz - actor->height; // Ensures perfect ceiling connection
else
workz = actor->floorz - actor->z;
actor->z = actor->floorz; // Ensures perfect floor connection
if (locvar2)
{
workh = FixedMul(mobjinfo[locvar2].height, actor->scale);
if (actor->flags2 & MF2_OBJECTFLIP)
workz += workh;
work = P_SpawnMobjFromMobj(actor, 0, 0, workz, locvar2);
workz += workh;
work = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar2);
if (work)
work->old_z = work->z; // Don't copy old_z from the actor
actor->z += P_MobjFlip(actor) * FixedMul(mobjinfo[locvar2].height, actor->scale);
}
if (!locvar1)
return;
if (!(workh = FixedMul(mobjinfo[locvar1].height, actor->scale)))
if (!locvar1 || !mobjinfo[locvar1].height) // Can't tile the middle object?
{
actor->z = endz;
return;
}
ang = actor->angle + ANGLE_45;
while (workz < 0)
while ((actor->flags2 & MF2_OBJECTFLIP) ? (actor->z > endz) : (actor->z < endz))
{
work = P_SpawnMobjFromMobj(actor, 0, 0, workz, locvar1);
work = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1);
if (work)
work->angle = ang;
{
work->angle = work->old_angle = ang;
work->old_z = work->z; // Don't copy old_z from the actor
}
ang += ANGLE_90;
workz += workh;
actor->z += P_MobjFlip(actor) * FixedMul(mobjinfo[locvar1].height, actor->scale);
}
if (workz != 0)
actor->z += P_MobjFlip(actor)*workz;
actor->old_z = actor->z; // Reset Z interpolation - the spawned objects intentionally don't have any Z interpolation either, after all
}
// Function: A_SpawnParticleRelative