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

* Updated to ZDoom r2629:

Browse source 
- Fixed: The automap was too aggressive about hiding markers.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@922 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-08-29 09:51:24 +00:00
parent 210825b5ec
commit d43f8a936f
3 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/am_map.cpp
View file

@ -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;
}