- Fixed: If you called the FString assignment operator that accepts a
const char * with a string inside its buffer, it released the buffer before copying the string. - Added a new FString constructor that creates the string from a lump. - Fixed: G_DoReborn() calls G_InitNew() with mapname set to level.mapname. G_InitNew() then copies it onto level.mapname, which is undefined behavior (although it does work as we want it to). - Modified FMemLump to store its data using FString. That class provides a convenient method of storing reference counted data, so now FMemLump doesn't need to muck about sneakily using const_casts and possibly tricking its users into thinking that an old one is still valid after being assigned to a new one. - Fixed: The IMGZ, PNG, PCX, and JPEG loaders assumed the files were large enough for their headers without actually checking. SVN r463 (trunk)
This commit is contained in:
parent
36839136fb
commit
af13d6d686
13 changed files with 92 additions and 64 deletions
|
|
@ -100,8 +100,7 @@ bool FJPEGTexture::Check(FileReader & file)
|
|||
{
|
||||
BYTE hdr[3];
|
||||
file.Seek(0, SEEK_SET);
|
||||
file.Read(hdr, 3);
|
||||
return (hdr[0] == 0xFF && hdr[1] == 0xD8 && hdr[2] == 0xFF);
|
||||
return file.Read(hdr, 3) == 3 && hdr[0] == 0xFF && hdr[1] == 0xD8 && hdr[2] == 0xFF;
|
||||
}
|
||||
|
||||
FTexture *FJPEGTexture::Create(FileReader & data, int lumpnum)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue