zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-03 18:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom 4172:

Browse source 
- Comment out star and bstar stuff in wi_stuff.cpp.
- Redo r4164 fix: Don't clear fake planes when clearing skybox planes.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1535 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2013-03-02 10:10:39 +00:00
parent d51123c1a1
commit 9ca1563054
6 changed files with 45 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/r_plane.cpp
View file

@ -492,13 +492,39 @@ void R_ClearPlanes (bool fullclear)
{
int i, max;
// kg3D - we can't just clear planes if there are fake planes
if(!fullclear && fakeActive) return;
max = fullclear ? MAXVISPLANES : MAXVISPLANES-1;
for (i = 0; i <= max; i++) // new code -- killough
for (*freehead = visplanes[i], visplanes[i] = NULL; *freehead; )
freehead = &(*freehead)->next;
// Don't clear fake planes if not doing a full clear.
if (!fullclear)
{
for (i = 0; i <= MAXVISPLANES-1; i++) // new code -- killough
{
for (visplane_t **probe = &visplanes[i]; *probe != NULL; )
{
if ((*probe)->sky < 0)
{ // fake: move past it
probe = &(*probe)->next;
}
else
{ // not fake: move to freelist
visplane_t *vis = *probe;
*freehead = vis;
*probe = vis->next;
vis->next = NULL;
freehead = &vis->next;
}
}
}
}
else
{
max = fullclear ? MAXVISPLANES : MAXVISPLANES-1;
for (i = 0; i <= MAXVISPLANES; i++) // new code -- killough
{
for (*freehead = visplanes[i], visplanes[i] = NULL; *freehead; )
{
freehead = &(*freehead)->next;
}
}
}
if (fullclear)
{
@ -597,7 +623,7 @@ visplane_t *R_FindPlane (const secplane_t &height, FTextureID picnum, int lightl
skybox = NULL;
alpha = FRACUNIT;
}
// New visplane algorithm uses hash table -- killough
hash = isskybox ? MAXVISPLANES : visplane_hash (picnum.GetIndex(), lightlevel, height);