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

Create doomednum lookup for loading mobjthinkers

Browse source 
Cuts off 10% of the time it takes to load mobj thinkers.
This commit is contained in:
Sally Coolatta 2024-10-12 23:02:31 -04:00
parent 4f77c9f228
commit aae9374b0a
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/p_saveg.cpp
View file

@ -4461,6 +4461,21 @@ static inline pslope_t *LoadSlope(UINT32 slopeid)
return NULL; return NULL;
} }
static mobjtype_t g_doomednum_to_mobjtype[UINT16_MAX];
static void CalculateDoomednumToMobjtype(void)
{
memset(g_doomednum_to_mobjtype, MT_NULL, sizeof(g_doomednum_to_mobjtype));
for (size_t i = MT_NULL+1; i < NUMMOBJTYPES; i++)
{
if (mobjinfo[i].doomednum > 0 && mobjinfo[i].doomednum <= UINT16_MAX)
{
g_doomednum_to_mobjtype[ mobjinfo[i].doomednum ] = static_cast<mobjtype_t>(i);
}
}
}
static thinker_t* LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) static thinker_t* LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
mobj_t *mobj; mobj_t *mobj;
@ -4532,20 +4547,26 @@ static thinker_t* LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
mobj->type = (mobjtype_t)READUINT32(save->p); mobj->type = (mobjtype_t)READUINT32(save->p);
else else
{ {
for (i = 0; i < NUMMOBJTYPES; i++) mobjtype_t new_type = MT_NULL;
if (mobj->spawnpoint && mobj->spawnpoint->type == mobjinfo[i].doomednum) if (mobj->spawnpoint)
break; {
if (i == NUMMOBJTYPES) new_type = g_doomednum_to_mobjtype[mobj->spawnpoint->type];
}
if (new_type <= MT_NULL || new_type >= NUMMOBJTYPES)
{ {
if (mobj->spawnpoint) if (mobj->spawnpoint)
CONS_Alert(CONS_ERROR, "Found mobj with unknown map thing type %d\n", mobj->spawnpoint->type); CONS_Alert(CONS_ERROR, "Found mobj with unknown map thing doomednum %d\n", mobj->spawnpoint->type);
else else
CONS_Alert(CONS_ERROR, "Found mobj with unknown map thing type NULL\n"); CONS_Alert(CONS_ERROR, "Found mobj with unknown map thing doomednum NULL\n");
I_Error("Netsave corrupted"); I_Error("Netsave corrupted");
} }
mobj->type = (mobjtype_t)i;
mobj->type = new_type;
} }
mobj->info = &mobjinfo[mobj->type]; mobj->info = &mobjinfo[mobj->type];
if (diff & MD_POS) if (diff & MD_POS)
{ {
mobj->x = mobj->old_x = READFIXED(save->p); mobj->x = mobj->old_x = READFIXED(save->p);
@ -5506,6 +5527,10 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
if (READUINT32(save->p) != ARCHIVEBLOCK_THINKERS) if (READUINT32(save->p) != ARCHIVEBLOCK_THINKERS)
I_Error("Bad $$$.sav at archive block Thinkers"); I_Error("Bad $$$.sav at archive block Thinkers");
// Pre-calculate this lookup, because it was wasting
// a shit ton of time loading mobj thinkers.
CalculateDoomednumToMobjtype();
// remove all the current thinkers // remove all the current thinkers
for (i = 0; i < NUM_THINKERLISTS; i++) for (i = 0; i < NUM_THINKERLISTS; i++)
{ {