mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-22 04:21:23 +00:00
Revert previous RemoveMobjInterpolator move
Matching Ring Racers. Previous move was actually a mistake on the Kart port. Done so there is never a condition where the interpolator isn't removed.
This commit is contained in:
parent
5bb7a527a1
commit
6d44eb8016
1 changed files with 2 additions and 3 deletions
|
@ -11147,13 +11147,14 @@ void P_RemoveMobj(mobj_t *mobj)
|
||||||
memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t));
|
memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
R_RemoveMobjInterpolator(mobj);
|
||||||
|
|
||||||
// free block
|
// free block
|
||||||
if (!mobj->thinker.next)
|
if (!mobj->thinker.next)
|
||||||
{ // Uh-oh, the mobj doesn't think, P_RemoveThinker would never go through!
|
{ // Uh-oh, the mobj doesn't think, P_RemoveThinker would never go through!
|
||||||
INT32 prevreferences;
|
INT32 prevreferences;
|
||||||
if (!mobj->thinker.references)
|
if (!mobj->thinker.references)
|
||||||
{
|
{
|
||||||
R_RemoveMobjInterpolator(mobj);
|
|
||||||
Z_Free(mobj); // No refrrences? Can be removed immediately! :D
|
Z_Free(mobj); // No refrrences? Can be removed immediately! :D
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -11164,8 +11165,6 @@ void P_RemoveMobj(mobj_t *mobj)
|
||||||
}
|
}
|
||||||
|
|
||||||
P_RemoveThinker((thinker_t *)mobj);
|
P_RemoveThinker((thinker_t *)mobj);
|
||||||
|
|
||||||
R_RemoveMobjInterpolator(mobj);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This does not need to be added to Lua.
|
// This does not need to be added to Lua.
|
||||||
|
|
Loading…
Reference in a new issue