From ccc7e5b1908ba67acb2f8b56e11e4207c4f905a6 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sun, 28 Jan 2024 21:48:51 -0500
Subject: [PATCH] =?UTF-8?q?Fix=20MCPI=20Ignoring=20=E2=99=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libreborn/src/util/cp437.cpp | 2 +-
 libreborn/src/util/string.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libreborn/src/util/cp437.cpp b/libreborn/src/util/cp437.cpp
index 8dd0e817ec..bb9062f2c9 100644
--- a/libreborn/src/util/cp437.cpp
+++ b/libreborn/src/util/cp437.cpp
@@ -16,7 +16,7 @@ static std::string to_utf8(const std::u32string &s) {
 // Minecraft-Flavored CP437
 #define CP437_CHARACTERS 256
 static const std::string cp437_characters_map[CP437_CHARACTERS] = {
-    "\0", "☺", "☻", "♥", "♦", "♣", "♠", "•", "◘", "○", "\n", "♂", "♀", "\r", "♫", "☼",
+    "\0", "☺", "☻", "♥", "♦", "♣", "♠", "•", "◘", "○", "\n", "♂", "♀", "♪", "♫", "☼",
     "►", "◄", "↕", "‼", "¶", "§", "▬", "↨", "↑", "↓", "→", "←", "∟", "↔", "▲", "▼",
     " ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/",
     "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ":", ";", "<", "=", ">", "?",
diff --git a/libreborn/src/util/string.c b/libreborn/src/util/string.c
index bf08000eaa..e9e713e110 100644
--- a/libreborn/src/util/string.c
+++ b/libreborn/src/util/string.c
@@ -14,7 +14,7 @@ void sanitize_string(char **str, int max_length, unsigned int allow_newlines) {
     // Loop Through Message
     if (!allow_newlines) {
         for (int i = 0; i < length; i++) {
-            if ((*str)[i] == '\n' || (*str)[i] == '\r') {
+            if ((*str)[i] == '\n') {
                 // Replace Newline
                 (*str)[i] = ' ';
             }