pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Diawind] Plus sign markdown fix (#2727)

Browse Source
This commit is contained in:
Chris Miles 2023-01-12 10:39:59 -06:00 committed by GitHub
parent 6d13f46c40
commit db7ab7a3ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/dialogue_window.cpp
View File

@ -69,12 +69,13 @@ void DialogueWindow::Render(Client *c, std::string markdown)
std::string animation = Strings::GetBetween(output, "+", "+"); std::string animation = Strings::GetBetween(output, "+", "+");
if (!animation.empty()) { if (!animation.empty()) {
LogDiaWind("Client [{}] Animation is not empty, contents are [{}]", c->GetCleanName(), animation); LogDiaWind("Client [{}] Animation is not empty, contents are [{}]", c->GetCleanName(), animation);
Strings::FindReplace(output, fmt::format("+{}+", animation), "");
// we treat the animation field differently if it is a number // we treat the animation field differently if it is a number
bool found_animation = false;
if (Strings::IsNumber(animation)) { if (Strings::IsNumber(animation)) {
LogDiaWindDetail("Client [{}] Animation is a number, firing animation [{}]", c->GetCleanName(), animation); LogDiaWindDetail("Client [{}] Animation is a number, firing animation [{}]", c->GetCleanName(), animation);
target->DoAnim(std::stoi(animation)); target->DoAnim(std::stoi(animation));
found_animation = true;
} }
else { else {
for (auto &a: animations) { for (auto &a: animations) {
@ -86,9 +87,14 @@ void DialogueWindow::Render(Client *c, std::string markdown)
a.first a.first
); );
target->DoAnim(a.second); target->DoAnim(a.second);
found_animation = true;
} }
} }
} }
if (found_animation) {
Strings::FindReplace(output, fmt::format("+{}+", animation), "");
}
} }
if (animation.empty() && RuleB(Chat, DialogueWindowAnimatesNPCsIfNoneSet)) { if (animation.empty() && RuleB(Chat, DialogueWindowAnimatesNPCsIfNoneSet)) {