incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Orbit object fixed

Browse source
This commit is contained in:
NepDisk 2025-01-26 18:51:31 -05:00
parent 4b3f67a634
commit 37afbae95d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -5814,7 +5814,7 @@ void K_RepairOrbitChain(mobj_t *orbit)
}
// Then recount to make sure item amount is correct
if (orbit->target && orbit->target->player)
if (orbit->target && orbit->target->player && !P_MobjWasRemoved(orbit->target))
{
INT32 num = 0;
@ -5831,7 +5831,7 @@ void K_RepairOrbitChain(mobj_t *orbit)
prev->movedir = num;
}
if (!P_MobjWasRemoved(orbit->target) && orbit->target->player->itemamount != num)
if (orbit->target && !P_MobjWasRemoved(orbit->target) && orbit->target->player->itemamount != num)
orbit->target->player->itemamount = num;
}
}

3
src/s_sound.c
View file

@ -1098,7 +1098,8 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
if (sfxinfo->pitch & SF_OUTSIDESOUND) // Rain special case
{
fixed_t x, y, yl, yh, xl, xh, newdist;
INT64 x, y, yl, yh, xl, xh;
fixed_t newdist;
if (R_PointInSubsector(listensource.x, listensource.y)->sector->ceilingpic == skyflatnum)
approx_dist = 0;