zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-17 17:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Don't use the global numsectors variable when testing if a map is a Build map in P_IsBuildMap()

Browse source 
and P_LoadBuildMap().

SVN r4065 (trunk)
This commit is contained in:
Randy Heit 2013-02-07 20:17:50 +00:00
parent 995d6f52e7
commit 8874cb140b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_buildmap.cpp
View file

@ -175,12 +175,12 @@ bool P_IsBuildMap(MapData *map)
return true; return true;
} }
numsectors = LittleShort(*(WORD *)(data + 20)); const int numsec = LittleShort(*(WORD *)(data + 20));
int numwalls; int numwalls;
if (len < 26 + numsectors*sizeof(sectortype) || if (len < 26 + numsec*sizeof(sectortype) ||
(numwalls = LittleShort(*(WORD *)(data + 22 + numsectors*sizeof(sectortype))), (numwalls = LittleShort(*(WORD *)(data + 22 + numsec*sizeof(sectortype))),
len < 24 + numsectors*sizeof(sectortype) + numwalls*sizeof(walltype)) || len < 24 + numsec*sizeof(sectortype) + numwalls*sizeof(walltype)) ||
LittleLong(*(DWORD *)data) != 7 || LittleLong(*(DWORD *)data) != 7 ||
LittleShort(*(WORD *)(data + 16)) >= 2048) LittleShort(*(WORD *)(data + 16)) >= 2048)
{ // Can't possibly be a version 7 BUILD map { // Can't possibly be a version 7 BUILD map
@ -210,19 +210,20 @@ bool P_LoadBuildMap (BYTE *data, size_t len, FMapThing **sprites, int *numspr)
return P_LoadBloodMap (data, len, sprites, numspr); return P_LoadBloodMap (data, len, sprites, numspr);
} }
numsectors = LittleShort(*(WORD *)(data + 20)); const int numsec = LittleShort(*(WORD *)(data + 20));
int numwalls; int numwalls;
int numsprites; int numsprites;
if (len < 26 + numsectors*sizeof(sectortype) || if (len < 26 + numsec*sizeof(sectortype) ||
(numwalls = LittleShort(*(WORD *)(data + 22 + numsectors*sizeof(sectortype))), (numwalls = LittleShort(*(WORD *)(data + 22 + numsec*sizeof(sectortype))),
len < 24 + numsectors*sizeof(sectortype) + numwalls*sizeof(walltype)) || len < 24 + numsec*sizeof(sectortype) + numwalls*sizeof(walltype)) ||
LittleLong(*(DWORD *)data) != 7 || LittleLong(*(DWORD *)data) != 7 ||
LittleShort(*(WORD *)(data + 16)) >= 2048) LittleShort(*(WORD *)(data + 16)) >= 2048)
{ // Can't possibly be a version 7 BUILD map { // Can't possibly be a version 7 BUILD map
return false; return false;
} }
numsectors = numsec;
LoadSectors ((sectortype *)(data + 22)); LoadSectors ((sectortype *)(data + 22));
LoadWalls ((walltype *)(data + 24 + numsectors*sizeof(sectortype)), numwalls, LoadWalls ((walltype *)(data + 24 + numsectors*sizeof(sectortype)), numwalls,
(sectortype *)(data + 22)); (sectortype *)(data + 22));