diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index bca08dfbb..1fa236ba0 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -361,7 +361,7 @@ std::string FormatNavigationLink(std::string value, bool brackets) { std::string name; int x = 0; int y = 0; - g_navigationLinkParser->ParseNavigationLink(std::move(value), name, x, y); + GetNavigationLinkParser()->ParseNavigationLink(std::move(value), name, x, y); char text[128] = {}; if (brackets) { @@ -946,7 +946,7 @@ void CCreateLineInfo::BuildWindows() { x = this->LayoutLink(x, text, segment->type, segment->style); break; case LINE_SEGMENT_MESSAGE: - x = this->LayoutText(x, g_navigationLinkParser->ExpandMessages(text), segment->style); + x = this->LayoutText(x, GetNavigationLinkParser()->ExpandMessages(text), segment->style); break; case LINE_SEGMENT_EMOTION: x = this->LayoutEmotion(x, text); diff --git a/Source/UI/Window/UIChangeNameWnd.cpp b/Source/UI/Window/UIChangeNameWnd.cpp index a6658fd2e..8ba72c2a9 100644 --- a/Source/UI/Window/UIChangeNameWnd.cpp +++ b/Source/UI/Window/UIChangeNameWnd.cpp @@ -102,7 +102,7 @@ int UIChangeNameWnd::SendMsg(UIWindow*, int message, std::intptr_t a, std::intpt case UM_COMMAND: switch (a) { case ID_OK: { - if (g_navigationLinkParser->HasLink(this->m_edit->Text()) == true) { + if (GetNavigationLinkParser()->HasLink(this->m_edit->Text()) == true) { g_windowMgr.Confirm(LookupMessage(MSI_STYLING_SHOP_OPEN_COUPON), 0, true, false, 0, "Message", 280, 120, 0); this->m_edit->SetText(""); return 0; diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp index 3a3554911..711b00b1f 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Window/UIRodexContentsWnd.cpp @@ -388,13 +388,13 @@ void UIRodexContentsWnd::SetMailContents(std::string title, std::string sender, this->m_sender = sender; std::string text = body; - std::pair lineBreak = g_navigationLinkParser->RemoveLineBreakTag(this->m_sender); + std::pair lineBreak = GetNavigationLinkParser()->RemoveLineBreakTag(this->m_sender); this->m_hasLineBreak = lineBreak.first; this->m_sender = lineBreak.second; - this->m_title = g_navigationLinkParser->ExpandMessages(this->m_title); - this->m_sender = g_navigationLinkParser->ExpandMessages(this->m_sender); - text = g_navigationLinkParser->ExpandMessages(text); + this->m_title = GetNavigationLinkParser()->ExpandMessages(this->m_title); + this->m_sender = GetNavigationLinkParser()->ExpandMessages(this->m_sender); + text = GetNavigationLinkParser()->ExpandMessages(text); this->m_contents = new UIRodexEditCtrl3(); this->m_contents->SetSize(267, 192);