zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-02 08:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-04-04 14:13:37 +02:00
commit 85ef1a11e9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdata.h
View file

@ -365,8 +365,6 @@ struct FMapThing
short pitch; short pitch;
short roll; short roll;
DWORD RenderStyle; DWORD RenderStyle;
//void Serialize (FArchive &);
}; };

2
src/resourcefiles/resourcefile.cpp
View file

@ -450,6 +450,8 @@ bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize
FResourceLump *lump; FResourceLump *lump;
int cmp; int cmp;
end = start = 0;
// Pretend that our range starts at 1 instead of 0 so that we can avoid // Pretend that our range starts at 1 instead of 0 so that we can avoid
// unsigned overflow if the range starts at the first lump. // unsigned overflow if the range starts at the first lump.
lumps = (BYTE *)lumps - lumpsize; lumps = (BYTE *)lumps - lumpsize;