From f9691a24ffab4bdbcce3dfd283009e75e0f44773 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 29 Aug 2010 03:37:41 +0000 Subject: [PATCH] - Fixed: The automap was too aggressive about hiding markers. SVN r2628 (trunk) --- src/am_map.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/am_map.cpp b/src/am_map.cpp index ea5e9c3b4..fd46c8018 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -2291,19 +2291,15 @@ void AM_drawAuthorMarkers () while (marked != NULL) { - if (mark->args[1] == 0 || (mark->args[1] == 1)) + // Use more correct info if we have GL nodes available + if (mark->args[1] == 0 || + (mark->args[1] == 1 && (hasglnodes ? + marked->subsector->flags & SSECF_DRAWN : + marked->Sector->MoreFlags & SECF_DRAWN))) { - // Use more correct info if we have GL nodes available - INTBOOL drawn = hasglnodes? - marked->subsector->flags & SSECF_DRAWN : - marked->Sector->MoreFlags & SECF_DRAWN; - - if (drawn) - { - DrawMarker (tex, marked->x >> FRACTOMAPBITS, marked->y >> FRACTOMAPBITS, 0, - flip, mark->scaleX, mark->scaleY, mark->Translation, - mark->alpha, mark->fillcolor, mark->RenderStyle); - } + DrawMarker (tex, marked->x >> FRACTOMAPBITS, marked->y >> FRACTOMAPBITS, 0, + flip, mark->scaleX, mark->scaleY, mark->Translation, + mark->alpha, mark->fillcolor, mark->RenderStyle); } marked = mark->args[0] != 0 ? it.Next() : NULL; }