OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Small lore adjustment.

Browse source 
Show AUTOPAGE texture in minimap when using color presets if available.
This commit is contained in:
Mari the Deer 2021-04-26 21:01:29 +02:00
commit 057a0cb94c
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zscript/hud/swwm_hud.zsc
View file

@ -10,7 +10,7 @@ Class SWWMStatusBar : BaseStatusBar
{
TextureID StatusTex, WeaponTex, ScoreTex[3], InventoryTex, ChatTex[6],
HealthTex[5], FuelTex[2], DashTex, EnemyBTex, EnemyHTex[5],
GenericAmmoTex[3], MiniBox;
GenericAmmoTex[3], MiniBox, AutoPage;
HUDFont mTewiFont, mMiniwiFont, mMPlusFont, mk6x8Font;
// "Full History" contains all messages since session start, nothing is flushed
@ -68,7 +68,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;
bool mm_displaylocks, mm_drawautopage;
// if playing in Japanese, returns an alternate font of the same height
// Tewi -> MPlus
@ -632,6 +632,7 @@ 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);
minimapzoom = oldminimapzoom = 1.;
mTewiFont = HUDFont.Create("TewiShaded");
mMiniwiFont = HUDFont.Create("MiniwiShaded");
@ -864,6 +865,7 @@ Class SWWMStatusBar : BaseStatusBar
private void GetMinimapColors()
{
mm_colorset = swwm_mm_colorset;
mm_drawautopage = AutoPage&&(am_drawmapback==1);
switch ( mm_colorset )
{
case 1:
@ -1020,6 +1022,7 @@ Class SWWMStatusBar : BaseStatusBar
mm_xhaircolor = swwm_mm_xhaircolor;
mm_yourcolor = swwm_mm_yourcolor;
mm_displaylocks = true;
mm_drawautopage = false;
break;
}
}
@ -1500,6 +1503,7 @@ Class SWWMStatusBar : BaseStatusBar
Screen.DrawTexture(MiniBox,false,xx,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
Vector2 basemappos = (xx+HALFMAPSIZE+2,yy+HALFMAPSIZE+2);
Screen.Dim(mm_backcolor,1.,int((basemappos.x-HALFMAPSIZE)*hs.x),int((basemappos.y-HALFMAPSIZE)*hs.x),int(HALFMAPSIZE*2*hs.x),int(HALFMAPSIZE*2*hs.x));
if ( mm_drawautopage ) Screen.DrawTexture(AutoPage,false,xx+2,yy+2,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_ClipRight,int((xx+2+HALFMAPSIZE*2)*hs.x),DTA_ClipBottom,int((yy+2+HALFMAPSIZE*2)*hs.x));
// draw dat stuff
if ( swwm_mm_grid ) DrawMapGrid(basemappos*hs.x);
DrawMapLines(basemappos*hs.x);