zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed memory leak from leftover code for 7z loading and added the 

LUMPF_ZIPFILE flag to their contents so they have the same semantics
  as zips.


SVN r1546 (trunk)
This commit is contained in:
Randy Heit 2009-04-15 23:33:36 +00:00
parent 7e7429e3d2
commit c2ff8c78dd
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/rh-log.txt
View File

@ -1,4 +1,9 @@
April 14, 2009
April 15, 2009
- Fixed memory leak from leftover code for 7z loading and added the
LUMPF_ZIPFILE flag to their contents so they have the same semantics
as zips.
April 14, 2009
- Added support for 7z archives.
April 13, 2009 (Changes by Graf Zahl)

9
src/w_wad.cpp
View File

@ -815,7 +815,7 @@ void FWadCollection::AddFile (const char *filename, const char *data, int length
lump_p->ZipNameSetup(name);
lump_p->size = file->Size;
lump_p->wadnum = (WORD)Wads.Size();
lump_p->flags = LUMPF_7ZFILE;
lump_p->flags = LUMPF_7ZFILE | LUMPF_ZIPFILE;
lump_p->position = i;
lump_p->compressedsize = -1;
lump_p++;
@ -2063,13 +2063,6 @@ FWadLump FWadCollection::OpenLumpNum (int lump)
SetLumpAddress(l);
}
if (l->flags & LUMPF_7ZFILE)
{
// An entry in a .7z file
char *buffer = new char[l->size + 1]; // the last byte is used as a reference counter
}
if (wad != NULL)
{
wad->Seek (l->position, SEEK_SET);