diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 3e495ae4..61c38214 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -7422,7 +7422,6 @@ int UIStatusWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in int UIStorePasswordInputWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) { CMode* mode = static_cast(g_charViewMode); auto& dialogs = *reinterpret_cast(&g_windowMgr); - const TextLocale locale = {}; if (message == 6) { switch (a) { @@ -10290,8 +10289,7 @@ void UIExchangeWnd::Paint() { continue; } const int y = this->m_rowHeight * row; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 16, y + 21, item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 16, y + 21, item, 0, 0); this->DrawFittedItemName(48, y + 29, &item, 0, 0, 12, 1); if (item.unknown_0088 > 0) { const std::string path = FormatOwnedString("유저인터페이스\\grade_enchant\\grade_icon%d.bmp", item.unknown_0088); @@ -10309,8 +10307,7 @@ void UIExchangeWnd::Paint() { continue; } const int y = this->m_rowHeight * row; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 295, y + 21, item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 295, y + 21, item, 0, 0); this->DrawFittedItemName(327, y + 29, &item, 0, 0, 12, 1); if (item.unknown_0088 > 0) { const std::string path = FormatOwnedString("유저인터페이스\\grade_enchant\\grade_icon%d.bmp", item.unknown_0088); diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index 71c1863d..974eabb2 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -2297,7 +2297,6 @@ void UIBasicSkillCtrl::Paint() { if (skill.level != 0) { std::sprintf(text, "%d", skill.level); FontCache& fonts = g_fontCache; - const TextLocale locale = {}; const int x = this->geometry.width - this->TextWidth(text, 0, 0, 11, 0, 0); this->DrawTextAt(x, 15, text, 0, 0, 11, 0xFFFFFF, 0, 0); this->DrawTextAt(x - 2, 15, text, 0, 0, 11, 0xFFFFFF, 0, 0); @@ -2334,7 +2333,6 @@ void UIBmpRadioBtn::Paint() { } FontCache& fonts = g_fontCache; - const TextLocale locale = {}; if (this->m_disabled == true) { for (auto it = this->m_texts.begin(); it != this->m_texts.end(); ++it) { if (it->id == 3) { @@ -3453,7 +3451,6 @@ void UIChatHisBox2::Paint() { } FontCache& fonts = g_fontCache; - const TextLocale locale = {}; for (int row = 0; top + row < static_cast(end); ++row) { const int index = top + row; int x; @@ -3488,7 +3485,6 @@ void UIChatHisBox3::Paint() { } FontCache& fonts = g_fontCache; - const TextLocale locale = {}; for (int row = 0; top + row < static_cast(end); ++row) { const int index = top + row; this->DrawTextAt(2, this->lineHeight * row + 3, this->lines[index].c_str(), 0, 0, this->unknown_0134, this->unknown_00E4[index], 0, 0); diff --git a/Source/UI/Chat/UISubChatHisWnd.cpp b/Source/UI/Chat/UISubChatHisWnd.cpp index 2e86d77a..d8ea3dde 100644 --- a/Source/UI/Chat/UISubChatHisWnd.cpp +++ b/Source/UI/Chat/UISubChatHisWnd.cpp @@ -92,7 +92,6 @@ bool UISubChatHisWnd::Slot42(void* output) { void UISubChatHisWnd::Paint() { this->ClearSurface(0xFFFF00FF); std::uint32_t color = 0xFFFFFF; - const TextLocale locale = {}; this->DrawTextAt(5, 4, this->m_name.c_str(), 0, 0, 12, 0, 0, 0); DrawColoredText(*this, 4, 3, this->m_name.c_str(), 0, color, 0, 12, false); this->FillRegion(2, 0, this->m_inputWidth - 5, 1, color); diff --git a/Source/UI/Edit/EditViewport.h b/Source/UI/Edit/EditViewport.h index 7d787f47..95b59f47 100644 --- a/Source/UI/Edit/EditViewport.h +++ b/Source/UI/Edit/EditViewport.h @@ -5,8 +5,6 @@ #include class CDC; -class FontCache; -struct TextLocale; struct CLanguageBase; struct EditTextState; @@ -19,8 +17,6 @@ struct EditViewport { const UINT& codePage; EditTextState& state; CDC& surface; - FontCache& fonts; - const TextLocale& locale; void Synchronize(); }; diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 8edc0212..12c74ab2 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -412,7 +412,6 @@ void UIEditCtrl::PaintText() { void UIEditCtrl::Synchronize() { const bool focused = g_windowMgr.hoverWindow == this; EditTextState state{this->text, this->anchor, this->cursor, this->maximum, focused, g_textCodePage}; - const TextLocale locale = {}; EditViewport viewport{ this->text, this->anchor, @@ -421,9 +420,7 @@ void UIEditCtrl::Synchronize() { this->geometry.width, g_textCodePage, state, - *this->geometry.surface, - g_fontCache, - locale + *this->geometry.surface }; viewport.Synchronize(); } @@ -890,7 +887,6 @@ void UIEditCtrl_Custom::Synchronize() { } FontCache& fonts = g_fontCache; - const TextLocale locale = {}; const int available = this->geometry.width - 12; if (this->cursor > previousCursor || clamped) { @@ -1412,8 +1408,7 @@ void UIItemBaseWnd::Paint() { const int x = visible % this->columns * 32 + 44; if (this->showQuantity != 0) { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); } else { DrawItemIcon(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0); } @@ -6865,8 +6860,7 @@ void UIItemStoreFindWnd::Paint() { const int left = visible % this->columns * 32 + 10; const int width = this->geometry.width - left - 66; const int x = left + 4; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawWrappedItemName(left + 40, top + 29, width, &*it, 0, 0, 12); if (it->unknown_0088 > 0) { @@ -6925,8 +6919,7 @@ void UIItemStoreSubWnd::Paint() { const int left = visible % this->columns * 32 + 10; const int width = this->geometry.width - left - 66; const int x = left + 4; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawWrappedItemName(left + 40, top + 29, width, &*it, 0, 0, 12); if (it->unknown_0088 > 0) { @@ -7005,8 +6998,7 @@ void UIItemPurchaseWnd::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); int nameWidth = 110; const int amount = static_cast(it->unknown_0014[0]); @@ -7135,8 +7127,7 @@ void UIItemSellWnd::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); int nameWidth = 100; const int amount = static_cast(it->unknown_0014[0]); @@ -7245,8 +7236,7 @@ void UIItemShopWnd::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); int nameWidth = 100; const int amount = static_cast(it->unknown_0014[0]); @@ -7394,8 +7384,7 @@ void UIItemStoreWnd::Paint() { const int top = visible / this->columns * 32; const int column = visible % this->columns * 32; const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawWrappedItemName(column + 80, top + 29, 180, &*it, 0, 0, 12); if (it->unknown_0088 > 0) { @@ -7477,8 +7466,7 @@ void UIMerchantItemPurchaseWnd::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawWrappedItemName(column + 76, top + 29, 90, &*it, 0, 0, 12); if (it->unknown_0088 > 0) { @@ -7676,8 +7664,7 @@ void UIMerchantShopMakeWnd::Paint() { const int top = visible / this->columns * 42; const int column = visible % this->columns * 42; const int x = column + 7; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 48, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 48, *it, 0, 0); this->DrawWrappedItemName(column + 39, top + 57, 100, &*it, 0, 0, 12); if (it->unknown_0088 > 0) { @@ -8335,8 +8322,7 @@ void UIMerchantItemShopWnd::Paint() { DrawItemIcon(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0); } else { x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); } if (it->unknown_0088 > 0) { @@ -8669,8 +8655,7 @@ void UIItemSellWnd2::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawFittedItemName(column + 76, top + 29, &*it, 0, 0, 12, 0); if (it->unknown_0088 > 0) { @@ -8749,8 +8734,7 @@ void UIItemShopWnd2::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawFittedItemName(column + 76, top + 29, &*it, 0, 0, 12, 0); if (it->unknown_0088 > 0) { @@ -9009,8 +8993,7 @@ void UIItemWnd::Paint() { const int top = visible / this->columns * 32; const int x = visible % this->columns * 32 + 44; const int y = top + 21; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, y, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, y, *it, 0, 0); if (it->unknown_0088 > 0) { this->DrawBitmap( diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index aef7a00e..82641b76 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -123,7 +123,6 @@ int UIEditCtrl3::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in const char* const start = current; current = reinterpret_cast((*reinterpret_cast(g_serverLanguage))[5])(g_serverLanguage, start, static_cast(end - start)); const int length = static_cast(current - start); - const TextLocale locale = {}; width += this->TextWidth(start, length, 0, 12, 0, 0); bytes += length; @@ -174,7 +173,6 @@ int UIEditCtrl3::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in const char* const start = current; current = reinterpret_cast((*reinterpret_cast(g_serverLanguage))[5])(g_serverLanguage, start, static_cast(end - start)); const int length = static_cast(current - start); - const TextLocale locale = {}; width += this->TextWidth(start, length, 0, 12, 0, 0); bytes += length; @@ -439,7 +437,6 @@ void UIEditCtrl_OldList::RecallHistory(int step) { // FUNCTION: fn_10753 void UIEditCtrl3::PaintText() { FontCache& fonts = g_fontCache; - const TextLocale locale = {}; int x = 3; if (this->invalidatesParent == 0 && this->firstVisible != 0) { @@ -747,7 +744,6 @@ void UIEditCtrl3::PaintText() { // OFFSET: 0x00853810 // FUNCTION: fn_10742 int UIEditCtrl::MeasureText(const std::string& text, const int& bytes) { - const TextLocale locale = {}; return this->TextWidth(text.c_str(), bytes, 0, 12, 0, 0); } diff --git a/Source/UI/Emotion/UIEmotionWnd.cpp b/Source/UI/Emotion/UIEmotionWnd.cpp index d4facb61..5d8882ee 100644 --- a/Source/UI/Emotion/UIEmotionWnd.cpp +++ b/Source/UI/Emotion/UIEmotionWnd.cpp @@ -96,7 +96,6 @@ void UIEmotionWnd::Slot15(int, int) { // OFFSET: 0x008A3000 // FUNCTION: fn_11645 void UIEmotionWnd::Paint() { - const TextLocale locale = {}; int titleHeight = this->UIWindow::DrawTitleBar(true, LookupMessage(574), 0); this->DrawPanelBackground(titleHeight, 0, ""); this->DrawButtonBar(2, 0, 1); diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index 672d234a..502758fd 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -372,7 +372,6 @@ void UIEntryQueueWnd::Slot15(int width, int height) { this->m_labels[index] = new UIStaticText(*this->m_context); if (this->m_labels[index]) { const char* label = labels[index]; - const TextLocale locale = {}; this->m_labels[index]->SetSize(this->TextWidth(label, 0, 0, 12, 0, 0), 25); this->m_labels[index]->SetText(label, 0); this->m_labels[index]->Move(157, y); @@ -422,7 +421,6 @@ void UIEntryQueueWnd::Slot15(int width, int height) { // OFFSET: 0x00BA7250 // FUNCTION: fn_19708 void UIEntryQueueWnd::Paint() { - const TextLocale locale = {}; this->DrawTitleBar(true, LookupMessage(0x603), 0); this->DrawPanelBackground(17, 0, ""); this->DrawButtonBar(2, 0, 1); @@ -594,7 +592,6 @@ void UIEntryQueueWnd::SelectQueue(EntryQueueInfo* info) { const int x = label->geometry.x; const int width = label->geometry.width; const int y = label->geometry.y; - const TextLocale locale = {}; this->m_values[index]->Resize(this->TextWidth(text, 0, 0, 12, 0, 0), 25); this->m_values[index]->SetText(text, 0); this->m_values[index]->Move(x + width + 5, y); diff --git a/Source/UI/Item/UIMerchantItemLogWnd.cpp b/Source/UI/Item/UIMerchantItemLogWnd.cpp index de366ba5..cab133d0 100644 --- a/Source/UI/Item/UIMerchantItemLogWnd.cpp +++ b/Source/UI/Item/UIMerchantItemLogWnd.cpp @@ -122,8 +122,7 @@ void UIMerchantItemLogWnd::Paint() { const int top = visible / this->columns * 32; const int x = visible % this->columns * 32 + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); if (it->unknown_0088 > 0) { this->DrawBitmap( diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Item/UIParaItemShopWnd.cpp index b0198bd3..3323e176 100644 --- a/Source/UI/Item/UIParaItemShopWnd.cpp +++ b/Source/UI/Item/UIParaItemShopWnd.cpp @@ -730,11 +730,9 @@ void UIParaItemShopWnd::Paint() { } if (this->unknown_00F8 == 1 || it->quantity != 0) { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 34, top + 4, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 34, top + 4, *it, 0, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 1, 34, top + 4, *it, 0, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 1, 34, top + 4, *it, 0, 0); } this->DrawWrappedItemName(70, top + 12, 120, &*it, 0, 0, 12); @@ -857,8 +855,7 @@ void UIParaResultWnd::Paint() { } const int x = column + 44; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, top + 21, *it, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, top + 21, *it, 0, 0); this->DrawWrappedItemName(column + 76, top + 29, 110, &*it, 0, 0, 12); if (it->unknown_0088 > 0) { diff --git a/Source/UI/Items/MergeItemWnd.cpp b/Source/UI/Items/MergeItemWnd.cpp index f073a6af..a2ec44f3 100644 --- a/Source/UI/Items/MergeItemWnd.cpp +++ b/Source/UI/Items/MergeItemWnd.cpp @@ -161,9 +161,8 @@ void CMergeItemWnd::Paint() { box->SetHidden(false); box->Move(this->m_checkOffsetX + x, this->m_checkOffsetY + y); ItemDescriptions descriptions{g_itemDescriptions}; - const TextLocale locale = {}; DrawItemWithQuantity( - *this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, this->m_slotOffsetX + x, this->m_slotOffsetY + y, item, 0, 0 + *this, ResourceMgr::Instance(), descriptions, this->m_slotOffsetX + x, this->m_slotOffsetY + y, item, 0, 0 ); } } diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index 350b8655..caab5c22 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -536,7 +536,6 @@ void UIChatHisBox::CopyHistory(const UIChatHisBox& other) { void UIComboBoxID::AddLine(const char* text, int id, int data) { const int index = static_cast(this->lines.size()); this->lines.emplace(index, IdListLine{id, text}); - const TextLocale locale = {}; const int width = this->TextWidth(text, 0, 0, 12, 0, 0); this->contentWidth = std::max(this->contentWidth, width); this->Refresh(); @@ -550,7 +549,6 @@ void UIComboBoxID::AddLine(const char* text, int id, int data) { // FUNCTION: fn_11203 void UIListBoxID::AddLine(const char* text, int id) { this->lines.emplace(static_cast(this->lines.size()), IdListLine{id, text}); - const TextLocale locale = {}; const int width = this->TextWidth(text, 0, 0, 12, 0, 0); this->contentWidth = std::max(this->contentWidth, width); this->Refresh(); diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index c44b5cd6..b595f645 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -655,7 +655,6 @@ void UIEditCtrl_Custom::PaintText() { const int y = this->unknown_0124 + this->textY; std::string display; FontCache& fonts = g_fontCache; - const TextLocale locale = {}; const auto align = [&]() { if (this->unknown_0128 == 1) { x = this->geometry.width - x - this->TextWidth(display.c_str(), 0, 0, 12, this->unknown_011C, 0); @@ -738,7 +737,6 @@ void UIBasicItemCtrl::DrawItemIcon(int x, int y, int, bool compact) { const std::string count = FormatOwnedString("%d", this->m_item.quantity); FontCache& fonts = g_fontCache; - const TextLocale locale = {}; int textY; if (compact) { textY = y + 20; @@ -1359,7 +1357,6 @@ void UIChatHisBox::Paint() { } FontCache& fonts = g_fontCache; - const TextLocale locale = {}; for (int row = 0; top + row < static_cast(end); ++row) { const int index = top + row; int x; diff --git a/Source/UI/Rodex/UIRodexComposeWnd.cpp b/Source/UI/Rodex/UIRodexComposeWnd.cpp index 22881fb2..f70ff287 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.cpp +++ b/Source/UI/Rodex/UIRodexComposeWnd.cpp @@ -517,11 +517,9 @@ void UIRodexComposeWnd::Paint() { const auto* shadowOn = &static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\shadow_item_on.bmp")))->image; this->DrawBitmap(itemX - 4, 319, shadowOn, true); if (this->unknown_00F8 <= g_session.m_zeny) { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, itemX, 309, item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, itemX, 309, item, 0, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 2, itemX, 309, item, item.identified, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 2, itemX, 309, item, item.identified, 0); } if (item.unknown_0088 > 0) { std::string gradeStr = FormatOwnedString("유저인터페이스\\grade_enchant\\grade_icon%d.bmp", static_cast(item.unknown_0088)); diff --git a/Source/UI/Shop/ItemDrawing.cpp b/Source/UI/Shop/ItemDrawing.cpp index 6c197424..b9c84f2a 100644 --- a/Source/UI/Shop/ItemDrawing.cpp +++ b/Source/UI/Shop/ItemDrawing.cpp @@ -11,7 +11,7 @@ // OFFSET: 0x008A8D30 // FUNCTION: fn_11716 void DrawItemWithQuantityAuxiliary( - UIWindow& window, ItemDescriptions& descriptions, FontCache& fonts, const TextLocale& locale, int mode, int x, int y, const ITEM_INFO& item, + UIWindow& window, ItemDescriptions& descriptions, int mode, int x, int y, const ITEM_INFO& item, unsigned char identified, unsigned char plain ) { char text[128] = {}; @@ -70,7 +70,7 @@ void DrawItemSlotBackground(UIWindow& window, int x, int y) { // OFFSET: 0x008A9040 // FUNCTION: fn_11720 void DrawItemWithQuantity( - UIWindow& window, ResourceMgr& resources, ItemDescriptions& descriptions, FontCache& fonts, const TextLocale& locale, int x, int y, const ITEM_INFO& item, + UIWindow& window, ResourceMgr& resources, ItemDescriptions& descriptions, int x, int y, const ITEM_INFO& item, unsigned char identified, unsigned char plain ) { DrawItemIcon(window, resources, descriptions, x, y, item, identified); diff --git a/Source/UI/Shop/ItemDrawing.h b/Source/UI/Shop/ItemDrawing.h index e172a40e..04830dfa 100644 --- a/Source/UI/Shop/ItemDrawing.h +++ b/Source/UI/Shop/ItemDrawing.h @@ -5,18 +5,16 @@ struct ITEM_INFO; struct ItemDescriptions; class UIWindow; class ResourceMgr; -class FontCache; -struct TextLocale; void DrawItemIcon(UIWindow& window, ResourceMgr& resources, ItemDescriptions& descriptions, int x, int y, const ITEM_INFO& item, unsigned char identified); void DrawItemIconById(UIWindow& window, ItemDescriptions& descriptions, int x, int y, const char* id, unsigned char identified); void DrawItemSlotBackground(UIWindow& window, int x, int y); void DrawItemWithQuantity( - UIWindow& window, ResourceMgr& resources, ItemDescriptions& descriptions, FontCache& fonts, const TextLocale& locale, int x, int y, const ITEM_INFO& item, + UIWindow& window, ResourceMgr& resources, ItemDescriptions& descriptions, int x, int y, const ITEM_INFO& item, unsigned char identified, unsigned char plain ); void DrawItemWithQuantityAuxiliary( - UIWindow& window, ItemDescriptions& descriptions, FontCache& fonts, const TextLocale& locale, int mode, int x, int y, const ITEM_INFO& item, + UIWindow& window, ItemDescriptions& descriptions, int mode, int x, int y, const ITEM_INFO& item, unsigned char identified, unsigned char plain ); diff --git a/Source/UI/Shortcuts/ShortcutCooldowns.cpp b/Source/UI/Shortcuts/ShortcutCooldowns.cpp index 1c3c5c92..21614f24 100644 --- a/Source/UI/Shortcuts/ShortcutCooldowns.cpp +++ b/Source/UI/Shortcuts/ShortcutCooldowns.cpp @@ -287,7 +287,6 @@ void UIRoMapWnd::Paint() { // OFFSET: 0x0092DE90 // FUNCTION: fn_12675 void UISeekPartyListWnd::Paint() { - const TextLocale locale = {}; this->DrawTitleBar(true, "", 0); if (this->m_minimized) { return; @@ -440,7 +439,7 @@ void UIQuickSlotWnd::Paint() { continue; } - DrawItemWithQuantity(*this, ResourceMgr::Instance(), painting.descriptions, painting.fonts, painting.locale, x, 5, item, item.identified, 1); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), painting.descriptions, x, 5, item, item.identified, 1); if (item.unknown_0088 > 0) { const std::string name = FormatOwnedString("유저인터페이스\\grade_enchant\\grade_icon%d.bmp", item.unknown_0088); auto* grade = static_cast(ResourceMgr::Instance().Load(Resolve(name.c_str()))); diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 7cbef6fa..a55d21ac 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -706,7 +706,6 @@ void UIRoMapWnd::Slot31(int x, int y) { if (!this->unknown_01FC.empty()) { UIWindow* menu = g_windowMgr.EnsureWindow(26); - const TextLocale locale = {}; int width = 0; for (const std::string& name : this->unknown_01FC) { const int textWidth = this->TextWidth(name.c_str(), 0, 0, 14, 0, 0); diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index 5765203c..6c2d9f8a 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -606,7 +606,6 @@ void LineCutter::UIText::Slot35(int value) { // FUNCTION: fn_10471 void LineCutter::UIText::Paint() { this->ClearSurface(0xFFFF00FF); - const TextLocale locale = {}; if (this->m_shadowed) { this->DrawTextAt(1, 1, this->m_text.c_str(), this->m_text.size(), 0, this->m_fontHeight, this->m_shadowColor, this->m_bold, @@ -1044,7 +1043,6 @@ tagSIZE CCreateLineInfo::MeasureText(UIWindow* window, std::string text, const L return tagSIZE{0, 0}; } - const TextLocale locale = {}; return window->TextSize(text.c_str(), text.size(), 0, style.fontHeight, style.bold, style.italic); } @@ -1139,7 +1137,6 @@ UIWindow* CCreateLineInfo::CreateTextWindow(std::string text, const LineTextStyl window->m_outlined = this->unknown_0028; window->m_shadowColor = this->unknown_0034; if (window->m_outlined == 1) { - const TextLocale locale = {}; const int textWidth = window->TextWidth(window->m_text.c_str(), 0, 0, style.fontHeight, style.bold, style.italic); window->Resize(textWidth + 2, style.fontHeight + 2); } diff --git a/Source/UI/UIBartermarketWnd.cpp b/Source/UI/UIBartermarketWnd.cpp index de3acc3a..86e228e8 100644 --- a/Source/UI/UIBartermarketWnd.cpp +++ b/Source/UI/UIBartermarketWnd.cpp @@ -1705,8 +1705,7 @@ void UIBarterItemPurchaseWnd::Paint() { } const ITEM_INFO item = it->ToItemInfo(); - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x + 44, y + 21, item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x + 44, y + 21, item, 0, 0); this->DrawItemName(x + 76, y + 29, 100, &item, 0, 0, 12); const std::string iconId = std::to_string(it->field_2c); DrawItemIconById(*this, descriptions, this->geometry.width - 70, y + 21, iconId.c_str(), 1); @@ -1790,8 +1789,7 @@ void UIBartermarketWnd::Paint() { if (it->flag_38) { DrawItemIcon(*this, ResourceMgr::Instance(), descriptions, x + 44, y + 21, item, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x + 44, y + 21, item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x + 44, y + 21, item, 0, 0); } this->DrawItemName(x + 76, y + 29, 120, &item, 0, 0, 12); const std::string iconId = std::to_string(it->field_2c); @@ -1849,8 +1847,7 @@ void UIExpandedBartermarketWnd::Paint() { } const ITEM_INFO item = it->ToItemInfo(); - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 44, y + 21, item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 44, y + 21, item, 0, 0); this->DrawItemName(76, y + 29, 100, &item, 0, 0, 12); if (it->field_28 > 0) { @@ -1865,7 +1862,7 @@ void UIExpandedBartermarketWnd::Paint() { chunkItem.quantity = chunk->amount * it->value; chunkItem.unknown_0060 = chunk->field_4; const int chunkX = 84 + chunkIndex * 42; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, chunkX - 8, y + 49, chunkItem, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, chunkX - 8, y + 49, chunkItem, 1, 0); if (chunk->field_4 > 0) { const std::string chunkAmount = FormatOwnedString("+%d", chunk->field_4); DrawOutlinedText(*this, chunkX, y + 49, chunkAmount.c_str(), 0, 0xFFFFFF, 200, 0, 12, 1, 0); @@ -1935,11 +1932,9 @@ void UIExpandedBarterItemPurchaseWnd::Paint() { if (it->flag_30) { DrawItemIcon(*this, ResourceMgr::Instance(), descriptions, 44, y + 21, item, 0); } else if (it->value == 0) { - const TextLocale locale = {}; - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 1, 44, y + 21, item, 1, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 1, 44, y + 21, item, 1, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 44, y + 21, item, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 44, y + 21, item, 1, 0); } this->DrawItemName(76, y + 29, 100, &item, 0, 0, 12); if (it->field_28 > 0) { @@ -1955,11 +1950,9 @@ void UIExpandedBarterItemPurchaseWnd::Paint() { chunkItem.unknown_0060 = chunk->field_4; const int chunkX = 76 + chunkIndex * 42; if (it->value == 0) { - const TextLocale locale = {}; - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 1, chunkX, y + 49, chunkItem, 1, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 1, chunkX, y + 49, chunkItem, 1, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, chunkX, y + 49, chunkItem, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, chunkX, y + 49, chunkItem, 1, 0); } if (chunk->field_4 != 0) { const std::string chunkAmount = FormatOwnedString("+%d", chunk->field_4); diff --git a/Source/UI/UIChangeMaterialWnd.cpp b/Source/UI/UIChangeMaterialWnd.cpp index 2296403e..7b981481 100644 --- a/Source/UI/UIChangeMaterialWnd.cpp +++ b/Source/UI/UIChangeMaterialWnd.cpp @@ -548,16 +548,13 @@ void UIChangeMaterialWnd::Paint() { const MaterialSlotPos* position = this->m_materialPos; for (auto it = this->m_materials.begin(); it != this->m_materials.end(); ++it, ++position) { if (it->identified == 1) { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, position->x, position->y, *it, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, position->x, position->y, *it, 1, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 1, position->x, position->y, *it, 1, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 1, position->x, position->y, *it, 1, 0); } } - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, this->m_resultX, this->m_resultY, this->m_resultItem, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, this->m_resultX, this->m_resultY, this->m_resultItem, 1, 0); const std::string amount = FormatOwnedString(LookupMessage(0xE8C), this->m_resultAmount / 10); const int width = this->TextWidth(amount.c_str(), 0, 0x1D, 0x17, 1, 0); @@ -607,7 +604,6 @@ void UIChangeMaterialWnd_List::Paint() { item.quantity = entry->results[0].quantity; item.identified = 1; - const TextLocale locale = {}; ItemDescriptions descriptions{g_itemDescriptions}; std::string name = item.DisplayName(0); if (this->TextWidth(name.c_str(), 0, 0, 12, 0, 0) > 100) { @@ -616,11 +612,11 @@ void UIChangeMaterialWnd_List::Paint() { const int y = rowHeight * row; if (entry->state == 1) { - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 0, y, item, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 0, y, item, 1, 0); this->DrawTextAt(30, y + 6, name.c_str(), 0, 0, 12, 0, 0, 0); this->DrawRightAlignedText(163, y + 6, FormatOwnedString(LookupMessage(182), item.quantity).c_str(), 0, 0, 12, 0, 0); } else { - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 1, 0, y, item, 1, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 1, 0, y, item, 1, 0); this->DrawTextAt(30, y + 6, name.c_str(), 0, 0, 12, 0xAAAAAA, 0, 0); this->DrawRightAlignedText(163, y + 6, FormatOwnedString(LookupMessage(182), item.quantity).c_str(), 0, 0, 12, 0xAAAAAA, 0); } diff --git a/Source/UI/UICheckAttendanceWnd.cpp b/Source/UI/UICheckAttendanceWnd.cpp index 8c736cd7..4fd32d48 100644 --- a/Source/UI/UICheckAttendanceWnd.cpp +++ b/Source/UI/UICheckAttendanceWnd.cpp @@ -209,8 +209,7 @@ void UICheckAttendanceWnd::Paint() { const int x = (day - 1) % 5 * 62; const int y = (day - 1) / 5 * 64; - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x + 43, y + 109 + bannerHeight, item, 1, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x + 43, y + 109 + bannerHeight, item, 1, 0); this->DrawCenteredText(x + 26, y + 140 + bannerHeight, FormatOwnedString(LookupMessage(3467), day).c_str(), 58, 0, 12, 0xA44F3B, 1); } } diff --git a/Source/UI/UILapineScrollBar.cpp b/Source/UI/UILapineScrollBar.cpp index 77b1fe23..a5406f12 100644 --- a/Source/UI/UILapineScrollBar.cpp +++ b/Source/UI/UILapineScrollBar.cpp @@ -231,11 +231,9 @@ void UIIngredientInfoWnd::Paint() { ItemDescriptions descriptions{g_itemDescriptions}; std::uint32_t color = 0; if (this->insufficient == 0) { - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 4, 3, this->item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 4, 3, this->item, 0, 0); } else { - const TextLocale locale = {}; - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 2, 4, 3, this->item, this->item.identified, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 2, 4, 3, this->item, this->item.identified, 0); color = 0x969696; } @@ -281,8 +279,7 @@ void UILapineBoxWnd::Paint() { } CBitmapRes* slot = static_cast(ResourceMgr::Instance().Load(Resolve("유저인터페이스\\lapine\\shadow_item_off.bmp"))); this->DrawBitmap(x - 4, y + 11, &slot->image, true); - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, y, this->items[index], 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, y, this->items[index], 0, 0); } if (timeGetTime() < this->noticeTick + this->noticeDuration) { diff --git a/Source/UI/UIMacroBlackListCheckWnd.cpp b/Source/UI/UIMacroBlackListCheckWnd.cpp index b776c0c3..8b5f1af3 100644 --- a/Source/UI/UIMacroBlackListCheckWnd.cpp +++ b/Source/UI/UIMacroBlackListCheckWnd.cpp @@ -95,7 +95,6 @@ void UIMacroBlackListCheckWnd::Slot15(int width, int height) { // OFFSET: 0x007EC1E0 // FUNCTION: fn_09795 void UIMacroBlackListCheckWnd::Paint() { - const TextLocale locale = {}; const int titleHeight = this->UIWindow::DrawTitleBar(true, LookupMessage(0x92F), this->geometry.width + 1); this->DrawPanelBackground(titleHeight, 0x21C, "유저인터페이스\\basic_interface\\blacklist_check_bg.bmp"); this->DrawButtonBar(2, this->geometry.width + 1, 1); diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index 7c7b4d6f..5d8645da 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -3175,8 +3175,6 @@ void CUIBasicButton::Slot55() { return; } - FontCache& fonts = g_fontCache; - const TextLocale locale = {}; if (this->disabled) { this->DrawTextAt(this->textX + 1, this->textY + 1, this->displayText.c_str(), 0, 0, 12, 0xE2E2E2, 0, 0); this->DrawTextAt(this->textX, this->textY, this->displayText.c_str(), 0, 0, 12, 0x6F6F6F, 0, 0); diff --git a/Source/UI/Window/UIDebuffRemoveWnd.cpp b/Source/UI/Window/UIDebuffRemoveWnd.cpp index 0b22abe3..3315ecd4 100644 --- a/Source/UI/Window/UIDebuffRemoveWnd.cpp +++ b/Source/UI/Window/UIDebuffRemoveWnd.cpp @@ -17,7 +17,6 @@ struct DebuffRemovePacket { // OFFSET: 0x0094D260 // FUNCTION: fn_12903 void UIDebuffRemoveWnd::Paint() { - const TextLocale locale = {}; this->DrawTitleBar(false, "", 0); this->DrawPanelBackground(17, 0, ""); } diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index d9c59eeb..1140c385 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -427,8 +427,6 @@ void UIHotKeyWnd::Paint() { return; } - FontCache& fonts = g_fontCache; - const TextLocale locale = {}; this->unknown_00BC = this->DrawTitleBar(true, LookupMessage(1494), 0); this->unknown_00C0 = this->DrawButtonBar(2, 0, 1); diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index eff1f0bf..1532d78c 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -148,7 +148,7 @@ namespace { } // INLINED - void DrawTextRight(UIWindow& window, FontCache& fonts, const TextLocale& locale, int x, int y, const char* text, int bytes, + void DrawTextRight(UIWindow& window, int x, int y, const char* text, int bytes, int family, int height, std::uint32_t color, unsigned char bold) { if (!bytes) { bytes = static_cast(std::strlen(text)); @@ -435,8 +435,7 @@ void UIMerInfoWnd::Paint() { for (int i = 0; i < 8; ++i) { const int value = i == 7 ? (2000 - g_session.m_mercenaryStats[i]) / 10 : g_session.m_mercenaryStats[i]; const int bytes = std::sprintf(number, "%d", value); - const TextLocale locale = {}; - DrawTextRight(*this, g_fontCache, locale, 79, 24 + 18 * i, number, bytes, 1, 14, 0, 0); + DrawTextRight(*this, 79, 24 + 18 * i, number, bytes, 1, 14, 0, 0); } this->DrawTextAt(136, 24, g_session.m_mercenaryName, 0, 0, 12, 0x646464, 0, 0); this->DrawTextAt(135, 24, g_session.m_mercenaryName, 0, 0, 12, 0, 0, 0); diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Window/UIRoMapWnd.cpp index 23cca188..fcd199d5 100644 --- a/Source/UI/Window/UIRoMapWnd.cpp +++ b/Source/UI/Window/UIRoMapWnd.cpp @@ -117,7 +117,6 @@ void UIRoMapWnd::DrawHoverTooltip() { return; } - const TextLocale locale = {}; bool leftSide = false; int maxWidth = 0; const int lineHeight = this->TextHeight(" ", 0, 0, 12, 1, 0) + 3; @@ -172,7 +171,6 @@ void UIRoMapWnd::DrawMapNames() { const int fontHeight = g_worldViewMgr.dungeonFontSize[g_worldViewMgr.screenScale]; const std::uint32_t color = g_worldViewMgr.dungeonFontColor; const std::uint32_t outline = g_worldViewMgr.dungeonFontOutline; - const TextLocale locale = {}; std::string name; std::vector::iterator it = g_worldViewMgr.CurrentWorld()->maps.begin(); const std::vector::iterator end = g_worldViewMgr.CurrentWorld()->maps.end(); @@ -213,7 +211,6 @@ void UIRoMapWnd::DrawFieldLabels() { const std::uint32_t levelColor = g_worldViewMgr.mobLevelColor; const std::uint32_t levelOutline = g_worldViewMgr.mobLevelOutline; const std::uint32_t borderColor = g_worldViewMgr.boxLineColor; - const TextLocale locale = {}; std::string name; bool atBottom = false; std::vector::iterator it = g_worldViewMgr.CurrentWorld()->maps.begin(); diff --git a/Source/UI/Window/UIRodexContentsWnd.cpp b/Source/UI/Window/UIRodexContentsWnd.cpp index 59da4220..63900718 100644 --- a/Source/UI/Window/UIRodexContentsWnd.cpp +++ b/Source/UI/Window/UIRodexContentsWnd.cpp @@ -186,8 +186,7 @@ void UIRodexContentsWnd::Paint() { ResourceMgr::Instance().Load(Resolve("유저인터페이스\\basic_interface\\rodexsystem\\renewal\\shadow_item_on.bmp")) ); this->DrawBitmap(x - 4, 319, &slot->image, true); - const TextLocale locale = {}; - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, 309, *item, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, 309, *item, 0, 0); if (item->unknown_0088 > 0) { ResourceMgr& resources = ResourceMgr::Instance(); const std::string name = FormatOwnedString("유저인터페이스\\grade_enchant\\grade_icon%d.bmp", item->unknown_0088); diff --git a/Source/UI/Window/UIRoulletteWnd.cpp b/Source/UI/Window/UIRoulletteWnd.cpp index 29682a84..2d37fbf1 100644 --- a/Source/UI/Window/UIRoulletteWnd.cpp +++ b/Source/UI/Window/UIRoulletteWnd.cpp @@ -187,7 +187,6 @@ void UIRoulletteWnd::Slot15(int, int) { // OFFSET: 0x0080C220 // FUNCTION: fn_10087 void UIRoulletteWnd::Paint() { - const TextLocale locale = {}; this->DrawTitleBar(true, LookupMessage(2641), 0); this->DrawPanelBackground(17, 0, "유저인터페이스\\basic_interface\\roullette\\roulletteBG.bmp"); @@ -216,18 +215,18 @@ void UIRoulletteWnd::Paint() { const int x = (row + column) * 36 + 159; const int y = 344 - row * 40; if (g_rouletteMgr->m_stage == row && (g_rouletteMgr->m_resultShown != 0 || g_rouletteMgr->m_spinning != 0)) { - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, x, y, it->second, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, x, y, it->second, 0, 0); } else { - DrawItemWithQuantityAuxiliary(*this, descriptions, g_fontCache, locale, 1, x, y, it->second, 0, 0); + DrawItemWithQuantityAuxiliary(*this, descriptions, 1, x, y, it->second, 0, 0); } } if (g_rouletteMgr->m_resultShown == 1 && g_rouletteMgr->m_resultItem.quantity != 0) { - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 189, 145, g_rouletteMgr->m_resultItem, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 189, 145, g_rouletteMgr->m_resultItem, 0, 0); } if (g_rouletteMgr->m_additionItem.quantity != 0) { - DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, g_fontCache, locale, 60, 135, g_rouletteMgr->m_additionItem, 0, 0); + DrawItemWithQuantity(*this, ResourceMgr::Instance(), descriptions, 60, 135, g_rouletteMgr->m_additionItem, 0, 0); } }