stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-24 04:32:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move flat caching procedure.

Browse source
This commit is contained in:
Nev3r 2019-12-12 12:57:31 +01:00
parent 51c129c0b7
commit 3b216441d4
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/p_setup.c
View file

@ -495,6 +495,7 @@ static inline void P_LoadRawSubsectors(void *data)
size_t numlevelflats; size_t numlevelflats;
levelflat_t *levelflats; levelflat_t *levelflats;
levelflat_t *foundflats;
//SoM: Other files want this info. //SoM: Other files want this info.
size_t P_PrecacheLevelFlats(void) size_t P_PrecacheLevelFlats(void)
@ -659,17 +660,8 @@ static void P_LoadRawSectors(UINT8 *data)
{ {
mapsector_t *ms = (mapsector_t *)data; mapsector_t *ms = (mapsector_t *)data;
sector_t *ss = sectors; sector_t *ss = sectors;
levelflat_t *foundflats;
size_t i; size_t i;
// Allocate a big chunk of memory as big as our MAXLEVELFLATS limit.
//Fab : FIXME: allocate for whatever number of flats - 512 different flats per level should be plenty
foundflats = calloc(MAXLEVELFLATS, sizeof (*foundflats));
if (foundflats == NULL)
I_Error("Ran out of memory while loading sectors\n");
numlevelflats = 0;
// For each counted sector, copy the sector raw data from our cache pointer ms, to the global table pointer ss. // For each counted sector, copy the sector raw data from our cache pointer ms, to the global table pointer ss.
for (i = 0; i < numsectors; i++, ss++, ms++) for (i = 0; i < numsectors; i++, ss++, ms++)
{ {
@ -740,16 +732,6 @@ static void P_LoadRawSectors(UINT8 *data)
ss->lineoutLength = -1.0l; ss->lineoutLength = -1.0l;
#endif // ----- end special tricks ----- #endif // ----- end special tricks -----
} }
// set the sky flat num
skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
// copy table for global usage
levelflats = M_Memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
free(foundflats);
// search for animated flats and set up
P_SetupLevelFlatAnims();
} }
// //
@ -1470,7 +1452,6 @@ static void P_LoadRawSideDefs2(void *data)
break; break;
} }
} }
R_ClearTextureNumCache(true);
} }
static boolean LineInBlock(fixed_t cx1, fixed_t cy1, fixed_t cx2, fixed_t cy2, fixed_t bx1, fixed_t by1) static boolean LineInBlock(fixed_t cx1, fixed_t cy1, fixed_t cx2, fixed_t cy2, fixed_t bx1, fixed_t by1)
@ -2275,6 +2256,14 @@ static void LoadMapData (const virtres_t* virt)
lines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL); lines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
mapthings= Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL); mapthings= Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
// Allocate a big chunk of memory as big as our MAXLEVELFLATS limit.
//Fab : FIXME: allocate for whatever number of flats - 512 different flats per level should be plenty
foundflats = calloc(MAXLEVELFLATS, sizeof (*foundflats));
if (foundflats == NULL)
I_Error("Ran out of memory while loading sectors\n");
numlevelflats = 0;
#ifdef UDMF #ifdef UDMF
if (textmap) if (textmap)
{ {
@ -2289,7 +2278,18 @@ static void LoadMapData (const virtres_t* virt)
P_LoadRawLineDefs(virtlinedefs->data); P_LoadRawLineDefs(virtlinedefs->data);
SetupLines(); SetupLines();
P_LoadRawSideDefs2(virtsidedefs->data); P_LoadRawSideDefs2(virtsidedefs->data);
R_ClearTextureNumCache(true);
} }
// set the sky flat num
skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
// copy table for global usage
levelflats = M_Memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
free(foundflats);
// search for animated flats and set up
P_SetupLevelFlatAnims();
} }
#if 0 #if 0