From e97f72b17686e96b600d797ce085e73442f25568 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Thu, 7 Oct 2021 19:47:08 +0200
Subject: [PATCH] Safeguards in SWWMDirectMessage.

---
 language.version              | 4 ++--
 zscript/hud/swwm_hudextra.zsc | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/language.version b/language.version
index 4e8ae418f..64fb080cf 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.17 \cu(Wed  6 Oct 19:02:58 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.1.17 \cu(2021-10-06 19:02:58)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.18 \cu(Thu  7 Oct 19:47:39 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.1.18 \cu(2021-10-07 19:47:39)\c-";
diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc
index f086d33e2..304bdc12b 100644
--- a/zscript/hud/swwm_hudextra.zsc
+++ b/zscript/hud/swwm_hudextra.zsc
@@ -373,6 +373,8 @@ Class SWWMDirectMessage : HUDMessageBase
 
 	private void SetText()
 	{
+		if ( !fnt ) fnt = Font.GetFont('TewiShaded');
+		if ( !jpfnt ) jpfnt = Font.GetFont('MPlusShaded');
 		String txt;
 		if ( (seqnum == 2) && znvspecial )
 		{
@@ -382,7 +384,8 @@ Class SWWMDirectMessage : HUDMessageBase
 		}
 		else txt = StringTable.Localize("$SWWM_"..seqname..seqnum);
 		if ( l ) l.Destroy();
-		l = fnt.BreakLines(txt,220);
+		let tfnt = (language~=="jp")?jpfnt:fnt;
+		l = tfnt.BreakLines(txt,220);
 		// append to the player's chat log (if it's valid)
 		if ( (seqnum < 1) || (seqnum > seqcnt) ) return;
 		let bar = SWWMStatusBar(StatusBar);