- fixed: Subsectors which are the origin of polyobjects should not be drawn on the textured automap because the vertices no longer are where they'd be expected to be.

SVN r2622 (trunk)

src/am_map.cpp

@@ -1609,6 +1609,11 @@ void AM_drawSubsectors()
 
 	for (int i = 0; i < numsubsectors; ++i)
 	{
+		if (subsectors[i].flags & SSECF_POLYORG)
+		{
+			continue;
+		}
+
 		if ((!(subsectors[i].flags & SSECF_DRAWN) || (subsectors[i].render_sector->MoreFlags & SECF_HIDDEN)) && am_cheat == 0)
 		{
 			continue;

src/po_man.cpp

@@ -1846,6 +1846,23 @@ void PO_Init (void)
 		double fdy = (double)no->dy;
 		no->len = (float)sqrt(fdx * fdx + fdy * fdy);
 	}
+
+	// mark all subsectors which have a seg belonging to a polyobj
+	// These ones should not be rendered on the textured automap.
+	for (int i = 0; i < numsubsectors; i++)
+	{
+		subsector_t *ss = &subsectors[i];
+		for(DWORD j=0;j<ss->numlines; j++)
+		{
+			if (ss->firstline[j].sidedef != NULL &&
+				ss->firstline[j].sidedef->Flags & WALLF_POLYOBJ)
+			{
+				ss->flags |= SSECF_POLYORG;
+				break;
+			}
+		}
+	}
+
 }
 
 //==========================================================================

src/r_defs.h

@@ -962,6 +962,7 @@ enum
 {
 	SSECF_DEGENERATE = 1,
 	SSECF_DRAWN = 2,
+	SSECF_POLYORG = 4,
 };
 
 struct subsector_t