Merge branch 'mapdataload_refactor' into 'next'
Mapdataload refactor See merge request STJr/SRB2!568
This commit is contained in:
commit
a932b54b26
|
@ -488,6 +488,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)
|
||||||
|
@ -651,17 +652,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++)
|
||||||
{
|
{
|
||||||
|
@ -728,16 +720,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();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -1449,7 +1431,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)
|
||||||
|
@ -1987,6 +1968,14 @@ static void P_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)
|
||||||
{
|
{
|
||||||
|
@ -2001,7 +1990,29 @@ static void P_LoadMapData(const virtres_t* virt)
|
||||||
P_LoadRawLineDefs(virtlinedefs->data);
|
P_LoadRawLineDefs(virtlinedefs->data);
|
||||||
P_SetupLines();
|
P_SetupLines();
|
||||||
P_LoadRawSideDefs2(virtsidedefs->data);
|
P_LoadRawSideDefs2(virtsidedefs->data);
|
||||||
|
P_PrepareRawThings(virtthings->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();
|
||||||
|
|
||||||
|
// Copy relevant map data for NetArchive purposes.
|
||||||
|
spawnsectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
|
||||||
|
spawnlines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
|
||||||
|
spawnsides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
|
||||||
|
|
||||||
|
memcpy(spawnsectors, sectors, numsectors * sizeof (*sectors));
|
||||||
|
memcpy(spawnlines, lines, numlines * sizeof (*lines));
|
||||||
|
memcpy(spawnsides, sides, numsides * sizeof (*sides));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -2179,8 +2190,6 @@ void P_LoadThingsOnly(void)
|
||||||
// Search through all the thinkers.
|
// Search through all the thinkers.
|
||||||
thinker_t *think;
|
thinker_t *think;
|
||||||
INT32 i, viewid = -1, centerid = -1; // for skyboxes
|
INT32 i, viewid = -1, centerid = -1; // for skyboxes
|
||||||
virtres_t* virt = vres_GetMap(lastloadedmaplumpnum);
|
|
||||||
virtlump_t* vth = vres_Find(virt, "THINGS");
|
|
||||||
|
|
||||||
// check if these are any of the normal viewpoint/centerpoint mobjs in the level or not
|
// check if these are any of the normal viewpoint/centerpoint mobjs in the level or not
|
||||||
if (skyboxmo[0] || skyboxmo[1])
|
if (skyboxmo[0] || skyboxmo[1])
|
||||||
|
@ -2201,11 +2210,8 @@ void P_LoadThingsOnly(void)
|
||||||
|
|
||||||
P_LevelInitStuff();
|
P_LevelInitStuff();
|
||||||
|
|
||||||
P_PrepareRawThings(vth->data);
|
|
||||||
P_LoadThings(true);
|
P_LoadThings(true);
|
||||||
|
|
||||||
vres_Free(virt);
|
|
||||||
|
|
||||||
// restore skybox viewpoint/centerpoint if necessary, set them to defaults if we can't do that
|
// restore skybox viewpoint/centerpoint if necessary, set them to defaults if we can't do that
|
||||||
skyboxmo[0] = skyboxviewpnts[(viewid >= 0) ? viewid : 0];
|
skyboxmo[0] = skyboxviewpnts[(viewid >= 0) ? viewid : 0];
|
||||||
skyboxmo[1] = skyboxcenterpnts[(centerid >= 0) ? centerid : 0];
|
skyboxmo[1] = skyboxcenterpnts[(centerid >= 0) ? centerid : 0];
|
||||||
|
@ -2768,17 +2774,6 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||||
P_LoadLineDefs2();
|
P_LoadLineDefs2();
|
||||||
P_GroupLines();
|
P_GroupLines();
|
||||||
|
|
||||||
// Copy relevant map data for NetArchive purposes.
|
|
||||||
spawnsectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
|
|
||||||
spawnlines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
|
|
||||||
spawnsides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
|
|
||||||
|
|
||||||
memcpy(spawnsectors, sectors, numsectors * sizeof (*sectors));
|
|
||||||
memcpy(spawnlines, lines, numlines * sizeof (*lines));
|
|
||||||
memcpy(spawnsides, sides, numsides * sizeof (*sides));
|
|
||||||
|
|
||||||
P_PrepareRawThings(vres_Find(virt, "THINGS")->data);
|
|
||||||
|
|
||||||
P_MakeMapMD5(virt, &mapmd5);
|
P_MakeMapMD5(virt, &mapmd5);
|
||||||
|
|
||||||
vres_Free(virt);
|
vres_Free(virt);
|
||||||
|
|
Loading…
Reference in a new issue