OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- store extended sector info directly in FLevelLocals.

Browse source 
This is safer than using the first sector's reference.
This commit is contained in:
Christoph Oelckers 2020-10-05 00:39:21 +02:00
commit 9a994482b1
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/maploader/maploader.cpp
View file

@ -1066,6 +1066,7 @@ void MapLoader::LoadSectors (MapData *map, FMissingTextureTracker &missingtex)
unsigned numsectors = lumplen / sizeof(mapsector_t);
Level->sectors.Alloc(numsectors);
Level->extsectors.Alloc(numsectors);
auto sectors = &Level->sectors[0];
memset (sectors, 0, numsectors*sizeof(sector_t));
@ -1078,12 +1079,9 @@ void MapLoader::LoadSectors (MapData *map, FMissingTextureTracker &missingtex)
ms = (mapsector_t*)msp.Data();
ss = sectors;
// Extended properties
sectors[0].e = new extsector_t[numsectors];
for (unsigned i = 0; i < numsectors; i++, ss++, ms++)
{
ss->e = &sectors[0].e[i];
ss->e = &Level->extsectors[i];
ss->Level = Level;
if (!map->HasBehavior) ss->Flags |= SECF_FLOORDROP;
ss->SetPlaneTexZ(sector_t::floor, (double)LittleShort(ms->floorheight));