From 9a5ef6b0ca67ba19e2785f5dc2d3af9355929664 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Tue, 9 Jun 2020 12:48:27 +0200
Subject: [PATCH] Handles newlines/wrapping on midprint override. Removed some
 dead code.

---
 language.version        |  2 +-
 zscript/swwm_hud.zsc    | 19 ++++++++++++++-----
 zscript/swwm_player.zsc |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/language.version b/language.version
index fbb6b2a3d..aaf5e45d5 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\cxSWWM GZ\c- r330 (Tue  9 Jun 12:27:54 CEST 2020)";
+SWWM_MODVER="\cxSWWM GZ\c- r331 (Tue  9 Jun 12:48:27 CEST 2020)";
diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc
index adf1ada25..916b80a80 100644
--- a/zscript/swwm_hud.zsc
+++ b/zscript/swwm_hud.zsc
@@ -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()));
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index b06439bf9..f7d2c7f3c 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -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;