zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-01 00:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The BUILD map loader did not create extsector information, and it also did not

Browse source 
set valid sidedef references for the backs of one-sided lines.

SVN r2218 (trunk)
This commit is contained in:
Randy Heit 2010-03-18 02:09:08 +00:00
parent 8e104d0a28
commit 92890066b6
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/p_buildmap.cpp
View file

@ -253,11 +253,11 @@ static bool P_LoadBloodMap (BYTE *data, size_t len, FMapThing **mapthings, int *
{ {
memcpy (infoBlock, data + 6, 37); memcpy (infoBlock, data + 6, 37);
} }
numRevisions = *(DWORD *)(infoBlock + 27); numRevisions = LittleLong(*(DWORD *)(infoBlock + 27));
numsectors = *(WORD *)(infoBlock + 31); numsectors = LittleShort(*(WORD *)(infoBlock + 31));
numWalls = *(WORD *)(infoBlock + 33); numWalls = LittleShort(*(WORD *)(infoBlock + 33));
numsprites = *(WORD *)(infoBlock + 35); numsprites = LittleShort(*(WORD *)(infoBlock + 35));
skyLen = 2 << *(WORD *)(infoBlock + 16); skyLen = 2 << LittleShort(*(WORD *)(infoBlock + 16));
if (mapver == 7) if (mapver == 7)
{ {
@ -365,6 +365,8 @@ static void LoadSectors (sectortype *bsec)
sec = sectors = new sector_t[numsectors]; sec = sectors = new sector_t[numsectors];
memset (sectors, 0, sizeof(sector_t)*numsectors); memset (sectors, 0, sizeof(sector_t)*numsectors);
sectors[0].e = new extsector_t[numsectors];
for (int i = 0; i < numsectors; ++i, ++bsec, ++sec) for (int i = 0; i < numsectors; ++i, ++bsec, ++sec)
{ {
bsec->wallptr = WORD(bsec->wallptr); bsec->wallptr = WORD(bsec->wallptr);
@ -372,6 +374,7 @@ static void LoadSectors (sectortype *bsec)
bsec->ceilingstat = WORD(bsec->ceilingstat); bsec->ceilingstat = WORD(bsec->ceilingstat);
bsec->floorstat = WORD(bsec->floorstat); bsec->floorstat = WORD(bsec->floorstat);
sec->e = &sectors[0].e[i];
sec->SetPlaneTexZ(sector_t::floor, -(LittleLong(bsec->floorz) << 8)); sec->SetPlaneTexZ(sector_t::floor, -(LittleLong(bsec->floorz) << 8));
sec->floorplane.d = -sec->GetPlaneTexZ(sector_t::floor); sec->floorplane.d = -sec->GetPlaneTexZ(sector_t::floor);
sec->floorplane.c = FRACUNIT; sec->floorplane.c = FRACUNIT;
@ -633,14 +636,17 @@ static void LoadWalls (walltype *walls, int numwalls, sectortype *bsec)
R_AlignFlat (linenum, sidenum == bsec->wallptr, 0); R_AlignFlat (linenum, sidenum == bsec->wallptr, 0);
} }
} }
for(i = 0; i < numsides; i++) for (i = 0; i < numlines; i++)
{ {
sides[i].linedef = &lines[intptr_t(sides[i].linedef)]; intptr_t front = intptr_t(lines[i].sidedef[0]);
intptr_t back = intptr_t(lines[i].sidedef[1]);
lines[i].sidedef[0] = front >= 0 ? &sides[front] : NULL;
lines[i].sidedef[1] = back >= 0 ? &sides[back] : NULL;
} }
for(i = 0; i < numlines; i++) for (i = 0; i < numsides; i++)
{ {
lines[i].sidedef[0] = &sides[intptr_t(lines[i].sidedef[0])]; assert(sides[i].sector != NULL);
lines[i].sidedef[1] = &sides[intptr_t(lines[i].sidedef[1])]; sides[i].linedef = &lines[intptr_t(sides[i].linedef)];
} }
} }

6
src/p_setup.cpp
View file

@ -711,9 +711,15 @@ void P_FloodZone (sector_t *sec, int zonenum)
continue; continue;
if (check->frontsector == sec) if (check->frontsector == sec)
{
assert(check->backsector != NULL);
other = check->backsector; other = check->backsector;
}
else else
{
assert(check->frontsector != NULL);
other = check->frontsector; other = check->frontsector;
}
if (other->ZoneNumber != zonenum) if (other->ZoneNumber != zonenum)
P_FloodZone (other, zonenum); P_FloodZone (other, zonenum);