mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-07-12 15:42:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid double line break when revealing MQness of spirit temple (#6912)

Browse Source
This commit is contained in:
Philip Dubé
2026-07-12 17:51:55 +00:00
committed by GitHub
parent a44197712c
commit ba08197d3b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
+8 -2
View File
@@ -506,7 +506,10 @@ size_t CustomMessage::FindNEWLINE(std::string& str, size_t lastNewline) const {
bool CustomMessage::AddBreakString(std::string& str, size_t pos, std::string breakString) const {
if (str[pos] == ' ' || str[pos] == '&') {
str.replace(pos, 1, breakString);
// don't add a break next to an existing newline
if (str[pos] != ' ' || (str[pos + 1] != '&' && str[pos + 1] != NEWLINE()[0])) {
str.replace(pos, 1, breakString);
}
return false;
} else {
if (pos <= str.size() - 1) {
@@ -515,7 +518,10 @@ bool CustomMessage::AddBreakString(std::string& str, size_t pos, std::string bre
return false;
// otherwise, if it is a line break or space, replace it
} else if (str[pos + 1] == ' ' || str[pos + 1] == '&') {
str.replace(pos + 1, 1, breakString);
// don't add a break next to an existing newline
if (str[pos + 1] != ' ' || (str[pos + 2] != '&' && str[pos + 2] != NEWLINE()[0])) {
str.replace(pos + 1, 1, breakString);
}
return false;
}
}