From aa8e152e0f0cbdb965ff95d5ae627c71ca45ff6d Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 6 Nov 2022 16:24:25 +0100 Subject: [PATCH] Strip newline on messages directly, rather than when appending. --- language.version | 4 ++-- zscript/hud/swwm_hud.zsc | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index e2c154a8d..1b44fdcdd 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r599 \cu(Sun 6 Nov 16:24:15 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r599 \cu(2022-11-06 16:24:15)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r599 \cu(Sun 6 Nov 16:24:25 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r599 \cu(2022-11-06 16:24:25)\c-"; diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 60ed3bd1f..a90ee14c6 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -859,12 +859,14 @@ Class SWWMStatusBar : BaseStatusBar { // ignore outside of levels if ( gamestate != GS_LEVEL ) return false; + // strip trailing newline (all Printf type messages have this) + outline.DeleteLastCharacter(); // append chat messages to full history if ( (printlevel == PRINT_CHAT) || (printlevel == PRINT_TEAMCHAT) ) - EventHandler.SendNetworkEvent("swwmstoremessage."..outline.Left(outline.Length()-1),level.totaltime,printlevel,consoleplayer); + EventHandler.SendNetworkEvent("swwmstoremessage."..outline,level.totaltime,printlevel,consoleplayer); if ( (printlevel < PRINT_LOW) || (printlevel > PRINT_TEAMCHAT) ) return true; // we couldn't care less about these let m = new("MsgLine"); - m.str = outline.Left(outline.Length()-1); // strip newline + m.str = outline; m.type = printlevel; m.tic = level.totaltime; m.rep = 1;