diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp index c9ef7a5fd..ea516a54c 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp +++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp @@ -993,7 +993,7 @@ void CUIListBox::SelectItem(CUIListItem* item) { // FUNCTION: fn_14329 void CUIAdventureGuide::Slot16() { const char* title = LookupMessage(0xFD5); - this->titleBar->SetTitle(title, std::strlen(title)); + this->titleBar->SetTitle(title); if (g_adventureGuideMgr->m_intros.empty()) { return; diff --git a/Source/UI/Enchant/UIEnchantUI.cpp b/Source/UI/Enchant/UIEnchantUI.cpp index 57f00fdca..6501cb6e8 100644 --- a/Source/UI/Enchant/UIEnchantUI.cpp +++ b/Source/UI/Enchant/UIEnchantUI.cpp @@ -1470,7 +1470,7 @@ void UpdateTargetItem(CUITargetItem* item, ITEM_INFO* info) { } item->unknown_00EC->Show(info->unknown_0088 > 0); const std::string name = info->DisplayName(0); - item->unknown_00F0->SetText(name.c_str(), name.size()); + item->unknown_00F0->SetText(name); } // OFFSET: 0x00A05E20 // FUNCTION: fn_14984 @@ -1572,7 +1572,7 @@ void CUIEnchantPage::Slot57() { } const std::string count = std::to_string(0); - this->unknown_009C->SetText(count.c_str(), count.size()); + this->unknown_009C->SetText(count); this->unknown_00A0->disabled = 1; this->unknown_00A0->Invalidate(); @@ -1613,7 +1613,7 @@ void CUIEnchantPage::ResetSlots() { this->enchantList->ClearData(); const std::string count = std::to_string(0); - this->unknown_009C->SetText(count.c_str(), count.size()); + this->unknown_009C->SetText(count); this->unknown_00A0->disabled = 1; this->unknown_00A0->Invalidate(); this->Slot59(-1); @@ -1659,7 +1659,7 @@ void CUINormalPerfect::Slot54(CUIEnchantItem* item, const CEnchantItemData& data } const std::string count = std::to_string(0); - this->unknown_009C->SetText(count.c_str(), count.size()); + this->unknown_009C->SetText(count); std::optional option = this->FindOption(this->unknown_00B0); if (option && (*option)->perfectEnchants.size() != 0) { @@ -1789,7 +1789,7 @@ void CUIEnchantPage::SetCost(const EnchantPerfectInfo& info) { } const std::string cost = std::to_string(info.cost); - this->unknown_009C->SetText(cost.c_str(), cost.size()); + this->unknown_009C->SetText(cost); const bool lackZeny = g_session.m_zeny < info.cost; const bool lackMaterial = std::any_of(this->unknown_0090.begin(), this->unknown_0090.end(), [](CUIIngredient* ingredient) { diff --git a/Source/UI/Exchange/UIExchangeUI.cpp b/Source/UI/Exchange/UIExchangeUI.cpp index 84d8fc41d..89011bc31 100644 --- a/Source/UI/Exchange/UIExchangeUI.cpp +++ b/Source/UI/Exchange/UIExchangeUI.cpp @@ -336,7 +336,7 @@ void CUIExchangeUI::Slot16() { { const std::string title = std::format("{} : ", LookupMessage(0xCE)); - this->titleBar->SetTitle(title.c_str(), title.size()); + this->titleBar->SetTitle(title); } this->unknown_010C->SetText(LookupMessage(0x727)); @@ -562,9 +562,9 @@ void CUIExchangeUI::UpdateZeny(bool mine) { char text[24]; FormatGroupedInteger(zeny, text, sizeof(text)); - first->SetText(text, std::strlen(text)); - second->SetText(text, std::strlen(text)); - third->SetText(text, std::strlen(text)); + first->SetText(text); + second->SetText(text); + third->SetText(text); const std::uint32_t color = PriceColor(zeny).primary; first->SetColor(color); diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index dcbb846da..246bd1a30 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -2079,19 +2079,19 @@ void CUIGameSettingsUI::OnTabChanged(UIWindow* window) { // OFFSET: 0x00A3F9B0 // FUNCTION: fn_15952 void SetComboItemAdapterText(GameSettingsUI::CUIComboItem* item, const RenderAdapter& adapter) { - item->m_text->SetText(adapter.description.c_str(), adapter.description.size()); + item->m_text->SetText(adapter.description); } // OFFSET: 0x00A3FA90 // FUNCTION: fn_15954 void SetComboItemModeText(GameSettingsUI::CUIComboItem* item, const DisplayMode& mode) { - item->m_text->SetText(mode.description.c_str(), mode.description.size()); + item->m_text->SetText(mode.description); } // OFFSET: 0x00A3FB20 // FUNCTION: fn_15956 void SetComboItemBackendText(GameSettingsUI::CUIComboItem* item, const RenderBackend& backend) { - item->m_text->SetText(backend.name.c_str(), backend.name.size()); + item->m_text->SetText(backend.name); } // OFFSET: 0x00A3FBA0 @@ -4173,7 +4173,7 @@ void GameSettingsUI::CUIListPage::BindOption(CUIOptionItem* item, const TALKTYPE item->m_label->disabled = option->tipBoxId <= 0; item->m_label->Invalidate(); item->m_label->SetId(option->tipBoxId); - item->m_description->SetText(option->description.c_str(), option->description.size()); + item->m_description->SetText(option->description); } // OFFSET: 0x00A42290 diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp index 5ee1895d7..091938abe 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp @@ -879,11 +879,11 @@ void CUIEquipmentPropertiesWnd::BindLine(EquipmentPropertiesWnd::CUIItemEquipmen std::vector title = Split(parts[0], "{~}"); if (title.size() > 1) { line->unknown_00E8->SetColor(0x3C00FF); - line->unknown_00E8->SetText(title[1].c_str(), title[1].size()); + line->unknown_00E8->SetText(title[1]); } else { - line->unknown_00E8->SetText(parts[0].c_str(), parts[0].size()); + line->unknown_00E8->SetText(parts[0]); } - line->unknown_00EC->SetText(parts[1].c_str(), parts[1].size()); + line->unknown_00EC->SetText(parts[1]); } else { line->unknown_00E8->SetText(""); line->unknown_00EC->SetText(parts[0].c_str(), parts[0].size()); diff --git a/Source/UI/Quest/UIOngoingQuestInfo.cpp b/Source/UI/Quest/UIOngoingQuestInfo.cpp index eb426975e..307a88545 100644 --- a/Source/UI/Quest/UIOngoingQuestInfo.cpp +++ b/Source/UI/Quest/UIOngoingQuestInfo.cpp @@ -301,7 +301,7 @@ void CUIRewards::OnBindItem(CUIRewardItem* item, const CRewardItemData& data) { // FUNCTION: fn_16308 void CUIOngoingQuestInfo::Slot16() { const char* title = LookupMessage(0xD48); - this->titleBar->SetTitle(title, std::strlen(title)); + this->titleBar->SetTitle(title); UIWindow* window = g_windowMgr.LookupWindow(0x2718); if (window) { this->Move(window->geometry.x + window->geometry.width, window->geometry.y); @@ -398,8 +398,8 @@ void CUIScrollWindow::SetQuest(unsigned int id) { for (int index = 0; index < quest.m_huntCount; ++index) { this->secondContents->textViewer->AddLine(quest.GetHuntText(index)); } - this->rewards->firstText->SetText(quest.unknown_01B8.c_str(), quest.unknown_01B8.size()); - this->rewards->secondText->SetText(quest.unknown_01D0.c_str(), quest.unknown_01D0.size()); + this->rewards->firstText->SetText(quest.unknown_01B8); + this->rewards->secondText->SetText(quest.unknown_01D0); for (const auto& reward : quest.m_rewards) { this->rewards->rewardList->AddData(CRewardItemData{static_cast(reward.first), static_cast(reward.second)}, false); } diff --git a/Source/UI/Quest/UIRecommendedQuestInfo.cpp b/Source/UI/Quest/UIRecommendedQuestInfo.cpp index 4e83a2e2e..f1b72d8d2 100644 --- a/Source/UI/Quest/UIRecommendedQuestInfo.cpp +++ b/Source/UI/Quest/UIRecommendedQuestInfo.cpp @@ -114,7 +114,7 @@ void CUIRecommendedQuestInfo::OnClose() { // FUNCTION: fn_16349 void CUIRecommendedQuestInfo::Slot16() { const char* title = LookupMessage(0xD48); - this->titleBar->SetTitle(title, std::strlen(title)); + this->titleBar->SetTitle(title); UIWindow* window = g_windowMgr.LookupWindow(0x2718); if (window) { this->Move(window->geometry.x + window->geometry.width, window->geometry.y); diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index 0578888ee..78fc232ed 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -1162,8 +1162,8 @@ void RenewQuestUI::CUIQuestList::BindItem(CUIQuestItem* item, const unsigned lon const RenewQuestRecommendedInfo& info = found->second; item->icon->SetImage(std::format("유저인터페이스\\renew_questui\\{}", info.m_icon.empty() ? std::string("ico_nq.bmp") : info.m_icon)); item->icon->tooltip = info.m_iconTooltip; - item->unknown_00EC->SetText(info.m_title.c_str(), info.m_title.size()); - item->unknown_00F0->SetText(info.unknown_004C.c_str(), info.unknown_004C.size()); + item->unknown_00EC->SetText(info.m_title); + item->unknown_00F0->SetText(info.unknown_004C); item->unknown_00F4->Show(0); item->unknown_00F8->Show(1); item->unknown_00F8->checked = info.m_active; @@ -1179,8 +1179,8 @@ void RenewQuestUI::CUIQuestList::BindItem(CUIQuestItem* item, const unsigned lon const RenewQuestOngoingInfo& info = found->second; item->icon->SetImage(std::format("유저인터페이스\\renew_questui\\{}", info.m_icon.empty() ? std::string("ico_nq.bmp") : info.m_icon)); item->icon->tooltip = info.m_iconTooltip; - item->unknown_00EC->SetText(info.m_title.c_str(), info.m_title.size()); - item->unknown_00F0->SetText(info.unknown_004C.c_str(), info.unknown_004C.size()); + item->unknown_00EC->SetText(info.m_title); + item->unknown_00F0->SetText(info.unknown_004C); item->unknown_00F4->Show(this->type != 8); item->unknown_00F4->checked = info.m_simpleView; item->unknown_00F4->Invalidate(); diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index b64b2ef9d..920659b20 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -1355,7 +1355,7 @@ void CUISelectPackageItemBox::Open(int sourceIndex) { // OFFSET: 0x00A70B90 // FUNCTION: fn_16790 void CUISelectPackageItemBox::BindTab(SelectPackageItemBox::CUITabInfo* tab, const SelectPackageItemBox::CTabInfoData& data) { - tab->nameText->SetText(data.name.c_str(), data.name.size()); + tab->nameText->SetText(data.name); } // OFFSET: 0x00A69350 diff --git a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp index 837740e15..5b39bc02b 100644 --- a/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp +++ b/Source/UI/SkillDelayInfo/UISkillDelayInfo.cpp @@ -450,7 +450,7 @@ void CUISkillDelayInfo::OnSelectItem(SkillDelayInfo::CUIDelayItem*, const SkillD // FUNCTION: fn_16881 void CUISkillDelayInfo::OnUpdateItem(SkillDelayInfo::CUIDelayItem* item, const SkillDelayInfo::CDelayItemData& data) { const std::string text = std::to_string(data.unknown_0000 + 1); - item->level->SetText(text.c_str(), text.size()); + item->level->SetText(text); for (int index = 0; index < 4; ++index) { const auto found = data.unknown_0004.find(index); @@ -589,21 +589,21 @@ void CUISkillDelayInfo::Slot16() { this->borderColor = SkinPaletteColor(ResourceMgr::Instance(), SkinPaletteCell{6, 2}, true); const char* text = LookupMessage(4254); - this->titleBar->SetTitle(text, std::strlen(text)); + this->titleBar->SetTitle(text); text = LookupMessage(4255); - this->columns[0]->SetText(text, std::strlen(text)); + this->columns[0]->SetText(text); text = LookupMessage(4256); - this->columns[1]->SetText(text, std::strlen(text)); + this->columns[1]->SetText(text); text = LookupMessage(4257); - this->columns[2]->SetText(text, std::strlen(text)); + this->columns[2]->SetText(text); text = LookupMessage(4258); - this->columns[3]->SetText(text, std::strlen(text)); + this->columns[3]->SetText(text); text = LookupMessage(4303); - this->labels[0]->SetText(text, std::strlen(text)); + this->labels[0]->SetText(text); text = LookupMessage(4304); - this->labels[1]->SetText(text, std::strlen(text)); + this->labels[1]->SetText(text); text = LookupMessage(4305); - this->labels[2]->SetText(text, std::strlen(text)); + this->labels[2]->SetText(text); this->delayList->unknown_00C4 = 1; this->delayList->Invalidate();