- a few more explicit local buffer allocations removed.

# Conflicts:
#	src/gl/data/gl_setup.cpp
This commit is contained in:
Christoph Oelckers 2018-12-21 10:26:09 +01:00 committed by drfrag
parent 82d05dce13
commit fcacb80db5
3 changed files with 11 additions and 21 deletions

View file

@ -549,8 +549,8 @@ void gl_PreprocessLevel()
PrepareSegs(); PrepareSegs();
PrepareSectorData(); PrepareSectorData();
InitVertexData(); InitVertexData();
int *checkmap = new int[level.vertexes.Size()]; TArray<int> checkmap(level.vertexes.Size());
memset(checkmap, -1, sizeof(int)*level.vertexes.Size()); memset(checkmap.Data(), -1, sizeof(int)*level.vertexes.Size());
for(auto &sec : level.sectors) for(auto &sec : level.sectors)
{ {
int i = sec.sectornum; int i = sec.sectornum;
@ -579,8 +579,6 @@ void gl_PreprocessLevel()
} }
} }
} }
delete[] checkmap;
gl_InitPortals(); gl_InitPortals();
if (GLRenderer != NULL) if (GLRenderer != NULL)
@ -588,10 +586,6 @@ void gl_PreprocessLevel()
GLRenderer->SetupLevel(); GLRenderer->SetupLevel();
} }
#if 0
gl_CreateSections();
#endif
InitGLRMapinfoData(); InitGLRMapinfoData();
} }

View file

@ -319,12 +319,12 @@ void R_InitSpriteDefs ()
struct Hasher struct Hasher
{ {
int Head, Next; int Head, Next;
} *hashes; };
struct VHasher struct VHasher
{ {
int Head, Next, Name, Spin; int Head, Next, Name, Spin;
char Frame; char Frame;
} *vhashes; };
unsigned int i, j, smax, vmax; unsigned int i, j, smax, vmax;
uint32_t intname; uint32_t intname;
@ -332,8 +332,8 @@ void R_InitSpriteDefs ()
// Create a hash table to speed up the process // Create a hash table to speed up the process
smax = TexMan.NumTextures(); smax = TexMan.NumTextures();
hashes = new Hasher[smax]; TArray<Hasher> hashes(smax, true);
memset(hashes, -1, sizeof(Hasher)*smax); memset(hashes.Data(), -1, sizeof(Hasher)*smax);
for (i = 0; i < smax; ++i) for (i = 0; i < smax; ++i)
{ {
FTexture *tex = TexMan.ByIndex(i); FTexture *tex = TexMan.ByIndex(i);
@ -347,8 +347,8 @@ void R_InitSpriteDefs ()
// Repeat, for voxels // Repeat, for voxels
vmax = Wads.GetNumLumps(); vmax = Wads.GetNumLumps();
vhashes = new VHasher[vmax]; TArray<VHasher> vhashes(vmax, true);
memset(vhashes, -1, sizeof(VHasher)*vmax); memset(vhashes.Data(), -1, sizeof(VHasher)*vmax);
for (i = 0; i < vmax; ++i) for (i = 0; i < vmax; ++i)
{ {
if (Wads.GetLumpNamespace(i) == ns_voxels) if (Wads.GetLumpNamespace(i) == ns_voxels)
@ -463,9 +463,6 @@ void R_InitSpriteDefs ()
R_InstallSprite ((int)i, sprtemp, maxframe); R_InstallSprite ((int)i, sprtemp, maxframe);
} }
delete[] hashes;
delete[] vhashes;
} }
//========================================================================== //==========================================================================

View file

@ -471,10 +471,9 @@ bool FSerializer::OpenReader(FCompressedBuffer *input)
} }
else else
{ {
char *unpacked = new char[input->mSize]; TArray<char> unpacked(input->mSize);
input->Decompress(unpacked); input->Decompress(unpacked.Data());
r = new FReader(unpacked, input->mSize); r = new FReader(unpacked.Data(), input->mSize);
delete[] unpacked;
} }
return true; return true;
} }