zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 12:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: R_DeinitPlanes did not free all visplanes because it called R_ClearPlanes with 'fullclear' set to false.

Browse source 
- removed some redundancy from R_ClearPlanes.
This commit is contained in:
Christoph Oelckers 2013-07-14 09:47:39 +02:00
parent 10dd75f902
commit e9be49f37d
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_plane.cpp
View file

@ -174,7 +174,15 @@ void R_InitPlanes ()
void R_DeinitPlanes () void R_DeinitPlanes ()
{ {
fakeActive = 0; fakeActive = 0;
R_ClearPlanes(false);
// do not use R_ClearPlanes because at this point the screen pointer is no longer valid.
for (int i = 0; i <= MAXVISPLANES; i++) // new code -- killough
{
for (*freehead = visplanes[i], visplanes[i] = NULL; *freehead; )
{
freehead = &(*freehead)->next;
}
}
for (visplane_t *pl = freetail; pl != NULL; ) for (visplane_t *pl = freetail; pl != NULL; )
{ {
visplane_t *next = pl->next; visplane_t *next = pl->next;
@ -490,7 +498,7 @@ void R_MapColoredPlane (int y, int x1)
void R_ClearPlanes (bool fullclear) void R_ClearPlanes (bool fullclear)
{ {
int i, max; int i;
// Don't clear fake planes if not doing a full clear. // Don't clear fake planes if not doing a full clear.
if (!fullclear) if (!fullclear)
@ -516,7 +524,6 @@ void R_ClearPlanes (bool fullclear)
} }
else else
{ {
max = fullclear ? MAXVISPLANES : MAXVISPLANES-1;
for (i = 0; i <= MAXVISPLANES; i++) // new code -- killough for (i = 0; i <= MAXVISPLANES; i++) // new code -- killough
{ {
for (*freehead = visplanes[i], visplanes[i] = NULL; *freehead; ) for (*freehead = visplanes[i], visplanes[i] = NULL; *freehead; )
@ -524,10 +531,7 @@ void R_ClearPlanes (bool fullclear)
freehead = &(*freehead)->next; freehead = &(*freehead)->next;
} }
} }
}
if (fullclear)
{
// opening / clipping determination // opening / clipping determination
clearbufshort (floorclip, viewwidth, viewheight); clearbufshort (floorclip, viewwidth, viewheight);
// [RH] clip ceiling to console bottom // [RH] clip ceiling to console bottom