OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: FWadCollection::MergeLumps() did not initialize the flags for any

Browse source 
marker lumps it inserted.
- Fixes to placate GCC.



SVN r963 (trunk)
This commit is contained in:
Randy Heit 2008-05-11 03:02:33 +00:00
commit 8ffd79eeca
5 changed files with 69 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/w_wad.cpp
View file

@ -1426,11 +1426,12 @@ int FWadCollection::MergeLumps (const char *start, const char *end, int space)
{
newlumps++;
strncpy (newlumpinfos[0].name, ustart, 8);
newlumpinfos[0].fullname=NULL;
newlumpinfos[0].fullname = NULL;
newlumpinfos[0].wadnum = -1;
newlumpinfos[0].position =
newlumpinfos[0].size = 0;
newlumpinfos[0].namespc = ns_global;
newlumpinfos[0].flags = 0;
}
newlumpinfos[newlumps++] = LumpInfo[i];
@ -1447,11 +1448,12 @@ int FWadCollection::MergeLumps (const char *start, const char *end, int space)
{
newlumps++;
strncpy (newlumpinfos[0].name, ustart, 8);
newlumpinfos[0].fullname=NULL;
newlumpinfos[0].fullname = NULL;
newlumpinfos[0].wadnum = -1;
newlumpinfos[0].position =
newlumpinfos[0].size = 0;
newlumpinfos[0].namespc = ns_global;
newlumpinfos[0].flags = 0;
}
}
else
@ -1499,6 +1501,7 @@ int FWadCollection::MergeLumps (const char *start, const char *end, int space)
LumpInfo[NumLumps].position =
LumpInfo[NumLumps].size = 0;
LumpInfo[NumLumps].namespc = ns_global;
LumpInfo[NumLumps].flags = 0;
NumLumps++;
}