blasthavers/blastmud
2
1
Fork 1
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

Fix problem of newlines without carriage returns.

Browse Source
This commit is contained in:
Condorra 2024-11-04 00:36:43 +11:00
parent 5e171f4b86
commit bbf80db343
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blastmud_game/src/message_handler/user_commands/look.rs
View File

@ -75,7 +75,7 @@ pub async fn describe_normal_item(
phrases.push(details); phrases.push(details);
} }
let phrases_str: Vec<&str> = phrases.iter().map(|p| p.as_str()).collect(); let phrases_str: Vec<&str> = phrases.iter().map(|p| p.as_str()).collect();
contents_desc.push_str(&(language::join_words(&phrases_str) + ".\n")); contents_desc.push_str(&(language::join_words(&phrases_str) + ".\r\n"));
} }
if let Some(liq_data) = item if let Some(liq_data) = item
@ -109,10 +109,10 @@ pub async fn describe_normal_item(
(Some((&LiquidType::Water, _)), None) => contents_desc.push_str("water"), (Some((&LiquidType::Water, _)), None) => contents_desc.push_str("water"),
_ => contents_desc.push_str("mixed fluids"), _ => contents_desc.push_str("mixed fluids"),
} }
contents_desc.push_str(".\n"); contents_desc.push_str(".\r\n");
} }
_ => contents_desc.push_str("It's completely dry.\n"), _ => contents_desc.push_str("It's completely dry.\r\n"),
} }
} }

2
blastmud_game/src/regular_tasks.rs
View File

@ -128,7 +128,7 @@ async fn process_sendqueue_once(pool: db::DBPool, listener_map: ListenerMap) ->
}, },
Some(msg) => MessageToListener::SendToSession { Some(msg) => MessageToListener::SendToSession {
session: item.session.session.clone(), session: item.session.session.clone(),
msg: msg, msg: msg.replace('\r', "").replace('\n', "\r\n"),
}, },
}, },
ack_notify: tx, ack_notify: tx,