OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Make minimap ignore certain automap settings.

Browse source
This commit is contained in:
Mari the Deer 2024-03-13 20:50:39 +01:00
commit a28780948b
2 changed files with 13 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
zscript/hud/swwm_hud_topstuff.zsc
View file

@ -246,17 +246,7 @@ extend Class SWWMStatusBar
return false;
}
// just check normal specials
if ( !special || (am_showtriggerlines == 0) ) return false;
if ( !ShouldDisplaySpecial(special) ) return false;
if ( special && (am_showtriggerlines >= 2) ) return true;
if ( (special == Door_Open)
|| (special == Door_Close)
|| (special == Door_CloseWaitOpen)
|| (special == Door_Raise)
|| (special == Door_Animated)
|| (special == Generic_Door) )
return false;
return true;
return (special && ShouldDisplaySpecial(special));
}
private bool CheckSectorAction( Sector s, int type, bool useonly )
{
@ -304,13 +294,13 @@ extend Class SWWMStatusBar
return 0;
if ( l.frontsector && (l.frontsector.flags&Sector.SECF_WASSECRET) )
{
if ( am_map_secrets && !(l.frontsector.flags&Sector.SECF_SECRET) ) return 1;
if ( (am_map_secrets == 2) && !(l.flags&Line.ML_SECRET) ) return 2;
if ( !(l.frontsector.flags&Sector.SECF_SECRET) ) return 1;
if ( !(l.flags&Line.ML_SECRET) ) return 2;
}
if ( l.backsector && (l.backsector.flags&Sector.SECF_WASSECRET) )
{
if ( am_map_secrets && !(l.backsector.flags&Sector.SECF_SECRET) ) return 1;
if ( (am_map_secrets == 2) && !(l.flags&Line.ML_SECRET) ) return 2;
if ( !(l.backsector.flags&Sector.SECF_SECRET) ) return 1;
if ( !(l.flags&Line.ML_SECRET) ) return 2;
}
return 0;
}
@ -423,15 +413,15 @@ extend Class SWWMStatusBar
{
int secwit = CheckSecret(l);
int lock = SWWMUtility.GetLineLock(l);
if ( (l.flags&Line.ML_SECRET) && !level.allmap ) // allmap will reveal these
if ( (l.flags&Line.ML_SECRET) && (am_cheat || !level.allmap) ) // allmap will reveal these
{
if ( am_cheat && l.backsector && mm_secretwallcolor )
if ( am_cheat && l.backsector )
col = mm_secretwallcolor;
else col = mm_wallcolor;
else col = (secwit==2)?mm_unexploredsecretcolor:(secwit==1)?mm_secretsectorcolor:mm_wallcolor;
}
else if ( mm_interlevelcolor && CheckExitLine(l) )
else if ( CheckExitLine(l) )
col = mm_interlevelcolor;
else if ( mm_intralevelcolor && CheckTeleportLine(l) )
else if ( CheckTeleportLine(l) )
col = mm_intralevelcolor;
else if ( (lock > 0) && (lock < 256) )
{
@ -460,8 +450,7 @@ extend Class SWWMStatusBar
else if ( lcol != -1 ) col = lcol;
else col = mm_lockedcolor;
}
else if ( mm_specialwallcolor && CheckTriggerLine(l) )
col = mm_specialwallcolor;
else if ( CheckTriggerLine(l) ) col = mm_specialwallcolor;
else if ( secwit == 1 ) col = mm_secretsectorcolor; // locked doors and trigger lines take priority over secrets
else if ( secwit == 2 ) col = mm_unexploredsecretcolor;
else if ( l.frontsector && l.backsector )