Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

runechat fixes #8500

Merged
SomeguyManperson merged 2 commits into from
May 17, 2020
Merged

runechat fixes #8500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d30087d
runechat fixes
monster860 May 14, 2020
1cc397b
there
monster860 May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions code/datums/chatmessage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* * extra_classes - Extra classes to apply to the span that holds the text
* * lifespan - The lifespan of the message in deciseconds
*/
/datum/chatmessage/New(text, atom/target, mob/owner, list/extra_classes = null, lifespan = CHAT_MESSAGE_LIFESPAN)
/datum/chatmessage/New(text, atom/target, mob/owner, list/extra_classes = list(), lifespan = CHAT_MESSAGE_LIFESPAN)
. = ..()
if (!istype(target))
CRASH("Invalid target given for chatmessage")
Expand Down Expand Up @@ -70,9 +70,6 @@
owned_by = owner.client
RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, .proc/on_ownedby_deleting)

if(!islist(extra_classes))
extra_classes = list()

// Clip message
var/maxlen = owned_by.prefs.max_chat_length
if (length_char(text) > maxlen)
Expand Down Expand Up @@ -111,7 +108,7 @@
// BYOND Bug #2563917
// Construct text
var/static/regex/html_metachars = new(@"&[A-Za-z]{1,7};", "g")
var/complete_text = "<span class='center maptext [extra_classes != null ? extra_classes.Join(" ") : ""]' style='color: [tgt_color]'>[text]</span>"
var/complete_text = "<span class='center maptext [extra_classes.Join(" ")]' style='color: [tgt_color]'>[text]</span>"
var/mheight = WXH_TO_HEIGHT(owned_by.MeasureText(replacetext(complete_text, html_metachars, "m"), null, CHAT_MESSAGE_WIDTH))
approx_lines = max(1, mheight / CHAT_MESSAGE_APPROX_LHEIGHT)

Expand Down Expand Up @@ -173,7 +170,7 @@
*/
/mob/proc/create_chat_message(atom/movable/speaker, datum/language/message_language, raw_message, list/spans, message_mode)
// Ensure the list we are using, if present, is a copy so we don't modify the list provided to us
spans = spans?.Copy()
spans = spans ? spans.Copy() : list()

// Check for virtual speakers (aka hearing a message through a radio)
var/atom/movable/originalSpeaker = speaker
Expand Down