OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove autopage drawing from minimap, looks ugly.

Browse source
This commit is contained in:
Mari the Deer 2022-06-24 16:26:54 +02:00
commit c19135cea8
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zscript/hud/swwm_hud.zsc
View file

@ -32,7 +32,7 @@ Class SWWMStatusBar : BaseStatusBar
{
TextureID StatusTex, WeaponTex, ScoreTex, InventoryTex, ChatTex[6],
HealthTex[6], FuelTex[2], DashTex, EnemyBTex, EnemyHTex[6],
GenericAmmoTex[3], MiniBox, AutoPage, bgtex;
GenericAmmoTex[3], MiniBox, bgtex;
Font mSmallFont, mBigFont, mTinyFont;
@ -103,7 +103,7 @@ Class SWWMStatusBar : BaseStatusBar
// minimap colors (thats a lot of 'em)
int mm_colorset;
Color mm_backcolor, mm_cdwallcolor, mm_efwallcolor, mm_fdwallcolor, mm_gridcolor, mm_interlevelcolor, mm_intralevelcolor, mm_lockedcolor, mm_notseencolor, mm_portalcolor, mm_secretsectorcolor, mm_secretwallcolor, mm_specialwallcolor, mm_thingcolor, mm_thingcolor_citem, mm_thingcolor_friend, mm_thingcolor_item, mm_thingcolor_monster, mm_thingcolor_ncmonster, mm_thingcolor_shootable, mm_thingcolor_vipitem, mm_thingcolor_missile, mm_tswallcolor, mm_unexploredsecretcolor, mm_wallcolor, mm_xhaircolor, mm_yourcolor;
bool mm_displaylocks, mm_drawautopage;
bool mm_displaylocks;
// deathmatch stuff
int playercount, rank, lead;
@ -1248,7 +1248,6 @@ Class SWWMStatusBar : BaseStatusBar
GenericAmmoTex[1] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxM.png",TexMan.Type_Any);
GenericAmmoTex[2] = TexMan.CheckForTexture("graphics/HUD/GenericAmmoBoxR.png",TexMan.Type_Any);
MiniBox = TexMan.CheckForTexture("graphics/HUD/MinimapBox.png",TexMan.Type_Any);
AutoPage = TexMan.CheckForTexture("AUTOPAGE",TexMan.Type_Autopage);
bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
mSmallFont = Font.GetFont('TewiFont');
mBigFont = Font.GetFont('TewiFontOutline');
@ -1494,7 +1493,6 @@ Class SWWMStatusBar : BaseStatusBar
private void GetMinimapColors()
{
mm_colorset = swwm_mm_colorset;
mm_drawautopage = AutoPage&&(am_drawmapback==1);
switch ( mm_colorset )
{
case 1:
@ -1651,7 +1649,6 @@ Class SWWMStatusBar : BaseStatusBar
mm_xhaircolor = swwm_mm_xhaircolor;
mm_yourcolor = swwm_mm_yourcolor;
mm_displaylocks = true;
mm_drawautopage = false;
break;
}
}
@ -2223,7 +2220,6 @@ Class SWWMStatusBar : BaseStatusBar
Vector2 basemappos = (xx+HALFMAPSIZE+2,yy+HALFMAPSIZE+2);
Screen.Dim(mm_backcolor,1.,int((basemappos.x-HALFMAPSIZE)*hs),int((basemappos.y-HALFMAPSIZE)*hs),int(HALFMAPSIZE*2*hs),int(HALFMAPSIZE*2*hs));
Screen.SetClipRect(int((basemappos.x-HALFMAPSIZE)*hs),int((basemappos.y-HALFMAPSIZE)*hs),int(HALFMAPSIZE*2*hs),int(HALFMAPSIZE*2*hs));
if ( mm_drawautopage ) Screen.DrawTexture(AutoPage,false,xx+2,yy+2,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
// draw dat stuff
if ( swwm_mm_grid ) DrawMapGrid(basemappos*hs);
DrawMapLines(basemappos*hs);