OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Handles newlines/wrapping on midprint override.

Browse source 
Removed some dead code.
This commit is contained in:
Mari the Deer 2020-06-09 12:48:27 +02:00
commit 9a5ef6b0ca
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
zscript/swwm_hud.zsc
View file

@ -1081,12 +1081,21 @@ Class SWWMStatusBar : BaseStatusBar
int col = (midtype&2)?midbcol.GetInt():midcol.GetInt();
int curtime = (midtic+int(35*midduration.GetFloat()))-level.totaltime;
double alph = clamp(curtime/20.,0.,1.);
BrokenLines l = fnt.BreakLines(midstr,int(ss.x*ssp));
int h = fnt.GetHeight();
int len = fnt.StringWidth(midstr);
xx = (ss.x*ssp-len)/2.;
yy = ss.y*ssp*.35;
Screen.Dim("Black",.8*alph,int((xx-6)*hs.x*hsp),int(yy*hs.y*hsp),int((len+12)*hs.x*hsp),int((h+4)*hs.y*hsp));
Screen.DrawText(fnt,col,int(xx),yy+2,midstr,DTA_VirtualWidthF,ss.x*ssp,DTA_VirtualHeightF,ss.y*ssp,DTA_KeepRatio,true,DTA_Alpha,alph);
int maxlen = 0;
for ( int i=0; i<l.Count(); i++ ) maxlen = max(maxlen,fnt.StringWidth(l.StringAt(i)));
xx = (ss.x*ssp-maxlen)/2.;
yy = ss.y*ssp*.375;
yy -= (h*l.Count()+4)/2.; // center
Screen.Dim("Black",.8*alph,int((xx-6)*hs.x*hsp),int(yy*hs.y*hsp),int((maxlen+12)*hs.x*hsp),int((h*l.Count()+4)*hs.y*hsp));
for ( int i=0; i<l.Count(); i++ )
{
int len = fnt.StringWidth(l.StringAt(i));
xx = (ss.x*ssp-len)/2.;
Screen.DrawText(fnt,col,int(xx),yy+2,l.StringAt(i),DTA_VirtualWidthF,ss.x*ssp,DTA_VirtualHeightF,ss.y*ssp,DTA_KeepRatio,true,DTA_Alpha,alph);
yy += h;
}
}
if ( MainQueue.Size() <= 0 ) return;
int mstart = max(0,MainQueue.Size()-(maxchat[chatopen>=gametic].GetInt()));

2
zscript/swwm_player.zsc
View file

@ -16,7 +16,7 @@ Class Demolitionist : PlayerPawn
double lastvelz, prevvelz;
double ssup;
transient CVar myvoice, mute, fly6dof, clrun, ntags, ntagcol;
transient CVar myvoice, mute, fly6dof, clrun;
SWWMStats mystats;
int cairtime;