vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

...Welp, I mixed up my commit names :V 

THIS commit's the MT_FIREDITEM fix, the LAST commit was me making sure the size of translationtablecache was correct.
This commit is contained in:
TehRealSalt 2018-11-29 05:36:40 -05:00
parent 576617ec71
commit 2789e76683
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/p_mobj.c
View File

@ -7210,23 +7210,24 @@ void P_MobjThinker(mobj_t *mobj)
}
break;
case MT_FIREDITEM:
{
fixed_t x, y, z;
if (mobj->movecount)
if (mobj->target && !P_MobjWasRemoved(mobj->target))
{
x = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
y = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
z = mobj->target->z + mobj->target->height/3;
fixed_t x, y, z;
if (mobj->movecount)
{
x = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
y = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
z = mobj->target->z + mobj->target->height/3;
}
else
{
x = mobj->target->x;
y = mobj->target->y;
z = mobj->target->z + 80*(mapheaderinfo[gamemap-1]->mobj_scale);
}
P_TeleportMove(mobj, x, y, z);
}
else
{
x = mobj->target->x;
y = mobj->target->y;
z = mobj->target->z + 80*(mapheaderinfo[gamemap-1]->mobj_scale);
}
P_TeleportMove(mobj, x, y, z);
break;
}
default:
if (mobj->fuse)
{ // Scenery object fuse! Very basic!