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

Changed zero RenderRadius logic - thing should still link to own sector

Browse source
This commit is contained in:
ZZYZX 2016-12-25 13:37:45 +02:00
parent fcd8a0ce92
commit 40a180c15f
1 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/p_map.cpp
View file

@ -6651,38 +6651,38 @@ void P_CreateSecNodeList(AActor *thing)
void P_LinkRenderSectors(AActor* thing) void P_LinkRenderSectors(AActor* thing)
{ {
// if this thing has RenderStyle None, don't link it anywhere. // if this thing has RenderStyle None, don't link it anywhere.
if (thing->renderradius == 0) if (thing->renderradius != 0)
return;
FBoundingBox box(thing->X(), thing->Y(), thing->renderradius > 0 ? thing->renderradius : thing->renderradius);
FBlockLinesIterator it(box);
line_t *ld;
// add to surrounding sectors
while ((ld = it.Next()))
{ {
if (!box.inRange(ld) || box.BoxOnLineSide(ld) != -1) FBoundingBox box(thing->X(), thing->Y(), thing->renderradius > 0 ? thing->renderradius : thing->renderradius);
continue; FBlockLinesIterator it(box);
line_t *ld;
// // add to surrounding sectors
// create necessary lists. while ((ld = it.Next()))
if (!thing->touching_render_sectors) thing->touching_render_sectors = new std::forward_list<sector_t*>();
//
if (ld->frontsector != thing->Sector)
{ {
if (std::find(thing->touching_render_sectors->begin(), thing->touching_render_sectors->end(), ld->frontsector) == thing->touching_render_sectors->end()) if (!box.inRange(ld) || box.BoxOnLineSide(ld) != -1)
thing->touching_render_sectors->push_front(ld->frontsector); continue;
if (!ld->frontsector->touching_render_things) ld->frontsector->touching_render_things = new std::forward_list<AActor*>();
ld->frontsector->touching_render_things->push_front(thing);
}
if (ld->backsector && ld->backsector != thing->Sector) //
{ // create necessary lists.
if (std::find(thing->touching_render_sectors->begin(), thing->touching_render_sectors->end(), ld->backsector) == thing->touching_render_sectors->end()) if (!thing->touching_render_sectors) thing->touching_render_sectors = new std::forward_list<sector_t*>();
thing->touching_render_sectors->push_front(ld->backsector);
if (!ld->backsector->touching_render_things) ld->backsector->touching_render_things = new std::forward_list<AActor*>(); //
ld->backsector->touching_render_things->push_front(thing); if (ld->frontsector != thing->Sector)
{
if (std::find(thing->touching_render_sectors->begin(), thing->touching_render_sectors->end(), ld->frontsector) == thing->touching_render_sectors->end())
thing->touching_render_sectors->push_front(ld->frontsector);
if (!ld->frontsector->touching_render_things) ld->frontsector->touching_render_things = new std::forward_list<AActor*>();
ld->frontsector->touching_render_things->push_front(thing);
}
if (ld->backsector && ld->backsector != thing->Sector)
{
if (std::find(thing->touching_render_sectors->begin(), thing->touching_render_sectors->end(), ld->backsector) == thing->touching_render_sectors->end())
thing->touching_render_sectors->push_front(ld->backsector);
if (!ld->backsector->touching_render_things) ld->backsector->touching_render_things = new std::forward_list<AActor*>();
ld->backsector->touching_render_things->push_front(thing);
}
} }
} }
@ -6702,25 +6702,28 @@ void P_LinkRenderSectors(AActor* thing)
void P_UnlinkRenderSectors(AActor* thing) void P_UnlinkRenderSectors(AActor* thing)
{ {
if (thing->touching_render_sectors) if (thing->renderradius != 0)
{ {
for (std::forward_list<sector_t*>::iterator it = thing->touching_render_sectors->begin(); if (thing->touching_render_sectors)
it != thing->touching_render_sectors->end(); it++)
{ {
sector_t* sec = (*it); for (std::forward_list<sector_t*>::iterator it = thing->touching_render_sectors->begin();
if (sec->touching_render_things) it != thing->touching_render_sectors->end(); it++)
{ {
sec->touching_render_things->remove(thing); sector_t* sec = (*it);
if (sec->touching_render_things->empty()) if (sec->touching_render_things)
{ {
delete sec->touching_render_things; sec->touching_render_things->remove(thing);
sec->touching_render_things = NULL; if (sec->touching_render_things->empty())
{
delete sec->touching_render_things;
sec->touching_render_things = NULL;
}
} }
} }
}
delete thing->touching_render_sectors; delete thing->touching_render_sectors;
thing->touching_render_sectors = NULL; thing->touching_render_sectors = NULL;
}
} }
if (thing->Sector->touching_render_things) if (thing->Sector->touching_render_things)