thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mobjcache memory leak after reloading gamestate

Browse source 
Weird history splice from 711804be
This commit is contained in:
Antonio Martinez 2024-10-07 16:59:51 -07:00 • committed by Eidolon
parent b3086d011d
commit 7d584c1f79
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_local.h
View file

@ -258,6 +258,7 @@ mobjtype_t P_GetMobjtype(UINT16 mthingtype);
void P_RespawnSpecials(void); void P_RespawnSpecials(void);
fixed_t P_GetMobjDefaultScale(mobj_t *mobj); fixed_t P_GetMobjDefaultScale(mobj_t *mobj);
mobj_t *P_AllocateMobj(void);
mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type); mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
void P_CalculatePrecipFloor(precipmobj_t *mobj); void P_CalculatePrecipFloor(precipmobj_t *mobj);

29
src/p_mobj.c
View file

@ -10844,6 +10844,24 @@ static void P_DefaultMobjShadowScale(mobj_t *thing)
} }
} }
mobj_t *P_AllocateMobj(void)
{
mobj_t *mobj;
if (mobjcache != NULL)
{
mobj = mobjcache;
mobjcache = mobjcache->hnext;
memset(mobj, 0, sizeof(*mobj));
}
else
{
mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
}
return mobj;
}
// //
// P_SpawnMobj // P_SpawnMobj
// //
@ -10870,16 +10888,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
type = MT_RAY; type = MT_RAY;
} }
if (mobjcache != NULL) mobj = P_AllocateMobj();
{
mobj = mobjcache;
mobjcache = mobjcache->hnext;
memset(mobj, 0, sizeof(*mobj));
}
else
{
mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
}
// this is officially a mobj, declared as soon as possible. // this is officially a mobj, declared as soon as possible.
mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker; mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;

4
src/p_saveg.cpp
View file

@ -4511,13 +4511,13 @@ static thinker_t* LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
return NULL; return NULL;
} }
mobj = (mobj_t*)Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL); mobj = P_AllocateMobj();
mobj->spawnpoint = &mapthings[spawnpointnum]; mobj->spawnpoint = &mapthings[spawnpointnum];
mapthings[spawnpointnum].mobj = mobj; mapthings[spawnpointnum].mobj = mobj;
} }
else else
mobj = (mobj_t*)Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL); mobj = P_AllocateMobj();
// declare this as a valid mobj as soon as possible. // declare this as a valid mobj as soon as possible.
mobj->thinker.function.acp1 = thinker; mobj->thinker.function.acp1 = thinker;