OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

use std::vector as return value for the FileReader's buffer readers.

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-19 16:16:56 +02:00
commit 21d6eb99eb
18 changed files with 66 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/maploader/glnodes.cpp
View file

@ -209,7 +209,7 @@ bool MapLoader::LoadGLVertexes(FileReader &lump)
auto gllen=lump.GetLength();
if (gllen < 4)
return false;
auto gldata = glbuf.Data();
auto gldata = glbuf.data();
if (*(int *)gldata == gNd5)
{
@ -288,13 +288,13 @@ bool MapLoader::LoadGLSegs(FileReader &lump)
const unsigned numverts = Level->vertexes.Size();
const unsigned numlines = Level->lines.Size();
if (!format5 && memcmp(data.Data(), "gNd3", 4))
if (!format5 && memcmp(data.data(), "gNd3", 4))
{
numsegs/=sizeof(glseg_t);
segs.Alloc(numsegs);
memset(&segs[0],0,sizeof(seg_t)*numsegs);
glseg_t * ml = (glseg_t*)data.Data();
glseg_t * ml = (glseg_t*)data.data();
for(i = 0; i < numsegs; i++)
{
// check for gl-vertices
@ -365,7 +365,7 @@ bool MapLoader::LoadGLSegs(FileReader &lump)
segs.Alloc(numsegs);
memset(&segs[0],0,sizeof(seg_t)*numsegs);
glseg3_t * ml = (glseg3_t*)(data.Data() + (format5? 0:4));
glseg3_t * ml = (glseg3_t*)(data.data() + (format5? 0:4));
for(i = 0; i < numsegs; i++)
{ // check for gl-vertices
const unsigned v1idx = checkGLVertex3(LittleLong(ml->v1));
@ -454,9 +454,9 @@ bool MapLoader::LoadGLSubsectors(FileReader &lump)
return false;
}
if (!format5 && memcmp(datab.Data(), "gNd3", 4))
if (!format5 && memcmp(datab.data(), "gNd3", 4))
{
mapsubsector_t * data = (mapsubsector_t*) datab.Data();
mapsubsector_t * data = (mapsubsector_t*) datab.data();
numsubsectors /= sizeof(mapsubsector_t);
Level->subsectors.Alloc(numsubsectors);
auto &subsectors = Level->subsectors;
@ -478,7 +478,7 @@ bool MapLoader::LoadGLSubsectors(FileReader &lump)
}
else
{
gl3_mapsubsector_t * data = (gl3_mapsubsector_t*) (datab.Data()+(format5? 0:4));
gl3_mapsubsector_t * data = (gl3_mapsubsector_t*) (datab.data()+(format5? 0:4));
numsubsectors /= sizeof(gl3_mapsubsector_t);
Level->subsectors.Alloc(numsubsectors);
auto &subsectors = Level->subsectors;
@ -545,7 +545,7 @@ bool MapLoader::LoadNodes (FileReader &lump)
lump.Seek(0, FileReader::SeekSet);
auto buf = lump.Read();
basemn = mn = (mapnode_t*)buf.Data();
basemn = mn = (mapnode_t*)buf.data();
used.Resize(numnodes);
memset (used.Data(), 0, sizeof(uint16_t)*numnodes);
@ -601,7 +601,7 @@ bool MapLoader::LoadNodes (FileReader &lump)
lump.Seek(0, FileReader::SeekSet);
auto buf = lump.Read();
basemn = mn = (gl5_mapnode_t*)buf.Data();
basemn = mn = (gl5_mapnode_t*)buf.data();
used.Resize(numnodes);
memset(used.Data(), 0, sizeof(uint16_t)*numnodes);