zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move openings deinit to r_memory

Browse source
This commit is contained in:
Magnus Norddahl 2017-01-04 19:13:58 +01:00
parent e0f1fc4066
commit 4bcc34f01c
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/swrenderer/r_main.cpp
View file

@ -102,7 +102,6 @@ static void R_ShutdownRenderer();
// EXTERNAL DATA DECLARATIONS ---------------------------------------------- // EXTERNAL DATA DECLARATIONS ----------------------------------------------
extern short *openings;
extern int fuzzviewheight; extern int fuzzviewheight;
@ -391,13 +390,7 @@ static void R_ShutdownRenderer()
R_DeinitSprites(); R_DeinitSprites();
R_DeinitPlanes(); R_DeinitPlanes();
Clip3DFloors::Instance()->Cleanup(); Clip3DFloors::Instance()->Cleanup();
// Free openings R_DeinitOpenings();
if (openings != NULL)
{
M_Free (openings);
openings = NULL;
}
R_FreeDrawSegs(); R_FreeDrawSegs();
} }

9
src/swrenderer/r_memory.cpp
View file

@ -61,4 +61,13 @@ namespace swrenderer
{ {
lastopening = 0; lastopening = 0;
} }
void R_DeinitOpenings()
{
if (openings != nullptr)
{
M_Free(openings);
openings = nullptr;
}
}
} }

1
src/swrenderer/r_memory.h
View file

@ -19,4 +19,5 @@ namespace swrenderer
ptrdiff_t R_NewOpening(ptrdiff_t len); ptrdiff_t R_NewOpening(ptrdiff_t len);
void R_FreeOpenings(); void R_FreeOpenings();
void R_DeinitOpenings();
} }