stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-26 11:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix old shadows interpolation

Browse source
This commit is contained in:
Sally Coolatta 2022-05-01 20:40:51 -04:00 committed by Eidolon
parent 2465eab7f6
commit d8cf6a13ec
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_mobj.c
View file

@ -5831,8 +5831,8 @@ void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on y
source->momx = source->momy = source->momz = 0; source->momx = source->momy = source->momz = 0;
P_UnsetThingPosition(source); P_UnsetThingPosition(source);
source->x = source->old_x = tx; source->x = source->old_x = tx;
source->y = source->old_x = ty; source->y = source->old_y = ty;
source->z = source->old_x = tz; source->z = source->old_z = tz;
P_SetThingPosition(source); P_SetThingPosition(source);
} }
} }
@ -6110,7 +6110,7 @@ void P_RunShadows(void)
if (dest->type == MT_THUNDERSHIELD) if (dest->type == MT_THUNDERSHIELD)
dest = dest->target; dest = dest->target;
P_SetOrigin(mobj, dest->x, dest->y, mobj->target->z); P_MoveOrigin(mobj, dest->x, dest->y, mobj->target->z);
if (((mobj->eflags & MFE_VERTICALFLIP) && (mobj->ceilingz > mobj->z+mobj->height)) if (((mobj->eflags & MFE_VERTICALFLIP) && (mobj->ceilingz > mobj->z+mobj->height))
|| (!(mobj->eflags & MFE_VERTICALFLIP) && (floorz < mobj->z))) || (!(mobj->eflags & MFE_VERTICALFLIP) && (floorz < mobj->z)))
@ -6128,7 +6128,7 @@ void P_RunShadows(void)
P_SetScale(mobj, FixedDiv(mobj->scale, max(FRACUNIT, ((mobj->target->z-mobj->z)/200)+FRACUNIT))); P_SetScale(mobj, FixedDiv(mobj->scale, max(FRACUNIT, ((mobj->target->z-mobj->z)/200)+FRACUNIT)));
// Check new position to see if you should still be on that ledge // Check new position to see if you should still be on that ledge
P_SetOrigin(mobj, dest->x, dest->y, mobj->z); P_MoveOrigin(mobj, dest->x, dest->y, mobj->z);
mobj->z = (mobj->eflags & MFE_VERTICALFLIP ? mobj->ceilingz : floorz); mobj->z = (mobj->eflags & MFE_VERTICALFLIP ? mobj->ceilingz : floorz);
@ -10049,6 +10049,8 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
P_SetTarget(&mobj->target, caster); // set the shadow's caster as the target P_SetTarget(&mobj->target, caster); // set the shadow's caster as the target
R_AddMobjInterpolator(mobj);
return mobj; return mobj;
} }