Maintenance: Resubmission of 14942 (gate: three existing in-class helpers whose lines changed lacked an annotation; marked // INLINED

Batch #14943 by ragnarok-clanker: no function's compiled code changes; checked with 741 compiled unit(s), including every includer of Source/ActorPickNode.h, Source/Client/Browser/BrowserClientSite.h, Source/Client/Browser/BrowserPopupDispatch.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Mode/CMode.h, Source/Client/Mode/ModeDragState.h, Source/Client/Replay.h, Source/Client/Session.h, Source/Client/Stove/StoveMgr.h, Source/Contents/AchievementMgr.h, Source/Contents/ActorNameCard.h, Source/Contents/Actors/CharacterRender.h, Source/Contents/Actors/EffectActors.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GrannyGameActor.h, Source/Contents/Actors/GroundScope.h, Source/Contents/Actors/Item.h, Source/Contents/Actors/Npc.h, Source/Contents/Actors/Pc.h, Source/Contents/Actors/RenderObjectState.h, Source/Contents/Actors/Skill.h, Source/Contents/AdventureGuideMgr.h, Source/Contents/Camera/Camera.h, Source/Contents/Camera/CameraState.h, Source/Contents/CashEmotionMgr.h, Source/Contents/Configuration/GameSettingsMgr.h, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AMachineEffect.h, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CaneOfEvilEyeEffect.h, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/CloudKillEffect.h, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectMaker.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/FuumaShouakuEffect.h, Source/Contents/Effects/GravityControlEffect.h, Source/Contents/Effects/HealSpEffect.h, Source/Contents/Effects/Level99Effect.h, Source/Contents/Effects/MapChainEffect.h, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/NyanggrassEffect.h, Source/Contents/Effects/Particle.h, Source/Contents/Effects/PowderingEffect.h, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RectUpEffect.h, Source/Contents/Effects/ShadowExceedEffect.h, Source/Contents/Effects/SkillEffects.h, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/StormCannonEffect.h, Source/Contents/Effects/ThrowEffects.h, Source/Contents/EntryQueueMgr.h, Source/Contents/EquipmentResourceMgr.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/Ground/GroundGeometry.h, Source/Contents/GuildInfo.h, Source/Contents/Items/ItemDescription.h, Source/Contents/Items/ItemInfo.h, Source/Contents/MapSkyMgr.h, Source/Contents/Messenger/MessengerWindows.h, Source/Contents/Models/ModelNode.h, Source/Contents/NavigationManager.h, Source/Contents/Party/AdventurerAgencyMgr.h, Source/Contents/RDamageVar.h, Source/Contents/RenewQuestMgr.h, Source/Contents/ReputeMgr.h, Source/Contents/RodexMailStore.h, Source/Contents/RouletteMgr.h, Source/Contents/Schedule/Schedule.h, Source/Contents/SignBoard/SignBoard.h, Source/Contents/Skills/ClientSkills.h, Source/Contents/Skills/PlayerSkillBundle.h, Source/Contents/Skills/SkillInfo.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/TipBoxTitles.h, Source/Contents/UserData/AccountLinkedUserDataMgr.h, Source/Contents/UserData/NormalItemSlots.h, Source/Contents/World/World.h, Source/Contents/WorldView/WorldViewData.h, Source/Render/Primitives/LightmappedPrimitive.h, Source/Render/Primitives/RenderPrimitive.h, Source/Render/Renderer.h, Source/Render/Textures/SpritePixels.h, Source/Render/Textures/Texture.h, Source/Resource/EZeffectResource.h, Source/Resource/Models/AnimatedModelResource.h, Source/Resource/Models/GrannyModelResource.h, Source/Resource/Sprites/ActionResource.h, Source/Resource/World/GroundResource.h, Source/Resource/World/WorldResource.h, Source/Resource/XmlNode.h, Source/UI/AdventureGuide/UIAdventureGuide.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UISlotBmpButton.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITextureButton.h, Source/UI/CashEmotion/UICashEmotionListWnd.h, Source/UI/CashEmotion/UICashEmotionPack.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomMakeWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UISubChatMiniWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Edit/UIItemTagCtrl.h, Source/UI/Enchant/EnchantUI.h, Source/UI/Exchange/UIExchangeUI.h, Source/UI/FrameSkin.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Gauges/UIPcGage.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Item/UIParaItemShopWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIExchangeWnd.h, Source/UI/Items/UIGameItem.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemIdentifyWnd.h, Source/UI/Items/UIItemParamChangeDisplayWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Layout/WindowGeometry.h, Source/UI/Lists/UIChatHisBox.h, Source/UI/Lists/UIComboBoxV2Wnd.h, Source/UI/Lists/UIImgMenu.h, Source/UI/Lists/UIListBoxID.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UITagListBox.h, Source/UI/Lists/UITreeView.h, Source/UI/Menu/UIMenuIconWnd.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/ProbabilityTable/UIProbabilityTable.h, Source/UI/Quest/UIQuestDisplay.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/Rodex/UIRodexInboxWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UIMerchantShopMakeWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Skill/UISkillDescribeWnd.h, Source/UI/Skill/UISkillListWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/CreateLineInfo.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIBalloonText.h, Source/UI/Text/UINameBalloonText.h, Source/UI/Text/UIStaticTextControl.h, Source/UI/Text/UIString.h, Source/UI/Text/UITextViewerControl.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroReport.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.h, Source/UI/Window/FuncDrawWNDChar.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRegisterMgr.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWindowMgr.inl, Source/Utility/Lexicon/LexiconSerializer.h.
This commit is contained in:
ragnarok-clanker 2026-11-08 16:44:36 +00:00
commit dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions

View file

@ -56,7 +56,7 @@ inline const MaterialListEntry* UIChangeMaterialWnd_List::GetEntry(unsigned int
// OFFSET: 0x005E03B0
// FUNCTION: fn_03861
UIChangeMaterialWnd::UIChangeMaterialWnd()
: UIFrameWnd(0), unknown_00B4(nullptr), unknown_00B8(nullptr), m_sortBox(nullptr), m_button(nullptr), m_resultItem(), m_materials(), m_resultAmount(0),
: UIFrameWnd(0), itemList(nullptr), searchEdit(nullptr), m_sortBox(nullptr), m_button(nullptr), m_resultItem(), m_materials(), m_resultAmount(0),
m_resultText() {
this->m_resultX = 168;
this->m_resultY = 131;
@ -70,7 +70,7 @@ UIChangeMaterialWnd::UIChangeMaterialWnd()
// OFFSET: 0x005E0560
// FUNCTION: fn_03862
UIChangeMaterialWnd_List::UIChangeMaterialWnd_List()
: UIFrameWnd(0), unknown_00B4(27), unknown_00B8(16), m_selectedIndex(0), m_hoverIndex(0), m_scrollOffset(0), m_previousScrollOffset(0), m_scrollBar(nullptr), m_items(),
: UIFrameWnd(0), rowHeight(27), scrollBarWidth(16), m_selectedIndex(0), m_hoverIndex(0), m_scrollOffset(0), m_previousScrollOffset(0), m_scrollBar(nullptr), m_items(),
m_entries() {
}
@ -84,10 +84,10 @@ UIChangeMaterialWnd_ScrollBar::UIChangeMaterialWnd_ScrollBar() : UIScrollBar() {
// FUNCTION: fn_03877
void UIChangeMaterialWnd_List::OnCreate(int width, int height) {
this->m_scrollBar = new UIChangeMaterialWnd_ScrollBar();
this->m_scrollBar->Configure(width - this->unknown_00B8, 0, 1, height);
this->m_scrollBar->Configure(width - this->scrollBarWidth, 0, 1, height);
this->m_scrollBar->Show(0);
this->AddChild(this->m_scrollBar);
this->m_pageSize = height / this->unknown_00B4;
this->m_pageSize = height / this->rowHeight;
this->UpdateScrollBar();
}
@ -151,7 +151,7 @@ void UIChangeMaterialWnd_List::Move(int x, int y) {
// OFFSET: 0x005E2590
// FUNCTION: fn_03883
void UIChangeMaterialWnd_List::OnLBtnUp(int, int position) {
const int rowHeight = this->unknown_00B4;
const int rowHeight = this->rowHeight;
const unsigned int last = static_cast<unsigned int>(this->m_items.size() - 1);
unsigned int index = static_cast<unsigned int>(position / rowHeight + this->m_scrollOffset);
index = std::min(index, last);
@ -183,13 +183,13 @@ void UIChangeMaterialWnd_List::OnMouseMove(int x, int y) {
// OFFSET: 0x005E2850
// FUNCTION: fn_03887
void UIChangeMaterialWnd::OnProcess() {
const std::string text = this->unknown_00B8->Text();
const std::string text = this->searchEdit->Text();
if (text.compare(LookupMessage(MSI_BO_RESEARCHREPORT_OFF)) != 0) {
if (text.empty()) {
this->unknown_00B8->SetText(LookupMessage(MSI_BO_RESEARCHREPORT_OFF));
this->unknown_00B8->TextColor(0xb1u, 0xb1u, 0xb1u, 0xffffffffu);
this->searchEdit->SetText(LookupMessage(MSI_BO_RESEARCHREPORT_OFF));
this->searchEdit->TextColor(0xb1u, 0xb1u, 0xb1u, 0xffffffffu);
} else {
this->unknown_00B8->TextColor(0, 0, 0, 0xffffffffu);
this->searchEdit->TextColor(0, 0, 0, 0xffffffffu);
}
}
}
@ -243,7 +243,7 @@ void UIChangeMaterialWnd_List::UpdateScrollBar() {
// OFFSET: 0x005E2B20
// FUNCTION: fn_03891
void UIChangeMaterialWnd_List::ApplyFilter(std::string text) {
const int rowHeight = this->unknown_00B4;
const int rowHeight = this->rowHeight;
this->m_pageSize = this->geometry.height / rowHeight;
this->m_selectedIndex = 0;
this->m_scrollOffset = 0;
@ -336,7 +336,7 @@ void UIChangeMaterialWnd::SendChangeMaterial() {
unsigned char* entry = packet + 0xC;
for (auto it = this->m_materials.begin(); it != this->m_materials.end(); ++it) {
*reinterpret_cast<std::uint16_t*>(entry + 2) = static_cast<std::uint16_t>(it->quantity);
*reinterpret_cast<std::uint16_t*>(entry) = static_cast<std::uint16_t>(it->unknown_0000[1]);
*reinterpret_cast<std::uint16_t*>(entry) = static_cast<std::uint16_t>(it->identity[1]);
entry += 4;
}
@ -363,8 +363,8 @@ int UIChangeMaterialWnd::SendMsg(
) {
switch (message) {
case UM_DEFPUSH:
if (sender == reinterpret_cast<UIWindow*>(this->unknown_00B8) && reinterpret_cast<UIWindow*>(this->unknown_00B8) == g_windowMgr.GetHoverWindow()) {
this->unknown_00B4->SendMsg(nullptr, UM_COMMAND, ID_SEARCH, reinterpret_cast<std::intptr_t>(this->unknown_00B8->Text()), 0, 0);
if (sender == reinterpret_cast<UIWindow*>(this->searchEdit) && reinterpret_cast<UIWindow*>(this->searchEdit) == g_windowMgr.GetHoverWindow()) {
this->itemList->SendMsg(nullptr, UM_COMMAND, ID_SEARCH, reinterpret_cast<std::intptr_t>(this->searchEdit->Text()), 0, 0);
}
break;
case UM_COMMAND:
@ -376,23 +376,23 @@ int UIChangeMaterialWnd::SendMsg(
g_windowMgr.CloseWindow(WID_CHANGEMATERIALWND);
break;
case ID_SEARCH:
this->unknown_00B4->SendMsg(nullptr, UM_COMMAND, ID_SEARCH, reinterpret_cast<std::intptr_t>(this->unknown_00B8->Text()), 0, 0);
this->itemList->SendMsg(nullptr, UM_COMMAND, ID_SEARCH, reinterpret_cast<std::intptr_t>(this->searchEdit->Text()), 0, 0);
break;
case 0x16c:
this->unknown_00B4->SortItems(argument2 > 0);
this->itemList->SortItems(argument2 > 0);
break;
case 0x19f:
this->unknown_00B4->SendMsg(nullptr, UM_REFRESHITEM, 0, 0, 0, 0);
this->itemList->SendMsg(nullptr, UM_REFRESHITEM, 0, 0, 0, 0);
break;
default:
break;
}
break;
case UM_UPPUSH:
this->unknown_00B4->SendMsg(nullptr, UM_UPPUSH, 0, 0, 0, 0);
this->itemList->SendMsg(nullptr, UM_UPPUSH, 0, 0, 0, 0);
break;
case UM_DOWNPUSH:
this->unknown_00B4->SendMsg(nullptr, UM_DOWNPUSH, 0, 0, 0, 0);
this->itemList->SendMsg(nullptr, UM_DOWNPUSH, 0, 0, 0, 0);
break;
case UM_REFRESHITEM:
if (argument1 != 0) {
@ -406,7 +406,7 @@ int UIChangeMaterialWnd::SendMsg(
info.SetItemId(it->id);
info.quantity = it->quantity;
const ITEM_INFO stock = LookupClientItem(g_session.m_inventoryItems, it->id, 1);
info.unknown_0000[1] = stock.unknown_0000[1];
info.identity[1] = stock.identity[1];
info.identified = it->quantity <= stock.quantity;
this->m_materials.push_back(info);
}
@ -565,7 +565,7 @@ void UIChangeMaterialWnd_List::Paint() {
}
}
const int rowHeight = this->unknown_00B4;
const int rowHeight = this->rowHeight;
if (!entry) {
CRes* disabled = ResourceMgr::Instance().Load(Resolve("유저인터페이스\\ChangeMaterial\\btn_material_disable.bmp"));
this->DrawBitmap(0, rowHeight * row, static_cast<CBitmapRes*>(disabled), true);
@ -650,7 +650,7 @@ void UIChangeMaterialWnd_ScrollBar::Paint() {
// OFFSET: 0x005E26B0
// FUNCTION: fn_03885
void UIChangeMaterialWnd_List::OnMouseHover(int x, int y) {
const int rowHeight = this->unknown_00B4;
const int rowHeight = this->rowHeight;
const int index = y / rowHeight + this->m_scrollOffset;
if (static_cast<unsigned int>(index) >= this->m_items.size()) {
return;
@ -698,16 +698,16 @@ void UIChangeMaterialWnd::OnCreate(int width, int height) {
close->SetId(201);
this->AddChild(close);
this->unknown_00B8 = new UIEditCtrl();
this->unknown_00B8->SetSize(118, 13);
this->unknown_00B8->Move(313, 262);
this->unknown_00B8->maximum = 20;
this->unknown_00B8->preserveInput = 1;
this->unknown_00B8->SetText(LookupMessage(MSI_BO_RESEARCHREPORT_OFF));
this->unknown_00B8->TextColor(0xB1u, 0xB1u, 0xB1u, 0xFFFFFFFFu);
this->unknown_00B8->Background(255, 236, 207);
this->unknown_00B8->topPadding = -1;
this->AddChild(this->unknown_00B8);
this->searchEdit = new UIEditCtrl();
this->searchEdit->SetSize(118, 13);
this->searchEdit->Move(313, 262);
this->searchEdit->maximum = 20;
this->searchEdit->preserveInput = 1;
this->searchEdit->SetText(LookupMessage(MSI_BO_RESEARCHREPORT_OFF));
this->searchEdit->TextColor(0xB1u, 0xB1u, 0xB1u, 0xFFFFFFFFu);
this->searchEdit->Background(255, 236, 207);
this->searchEdit->topPadding = -1;
this->AddChild(this->searchEdit);
UIBmpTextButton* search = new UIBmpTextButton();
search->SetBitmap("유저인터페이스\\ChangeMaterial\\btn_search.bmp", 0, 0);
@ -756,11 +756,11 @@ void UIChangeMaterialWnd::OnCreate(int width, int height) {
cancel->SetId(201);
this->AddChild(cancel);
this->unknown_00B4 = new UIChangeMaterialWnd_List();
this->unknown_00B4->SetSize(186, 216);
this->unknown_00B4->Move(310, 41);
this->AddChild(this->unknown_00B4);
this->unknown_00B4->SendMsg(nullptr, UM_REFRESHITEM, 0, 0, 0, 0);
this->itemList = new UIChangeMaterialWnd_List();
this->itemList->SetSize(186, 216);
this->itemList->Move(310, 41);
this->AddChild(this->itemList);
this->itemList->SendMsg(nullptr, UM_REFRESHITEM, 0, 0, 0, 0);
}
// OFFSET: 0x005E1E20
@ -779,12 +779,12 @@ void UIChangeMaterialWnd_CheckBox::Paint() {
return;
}
if (this->geometry.unknown_0030 == 0) {
if (this->geometry.state == 0) {
this->DrawBitmap(0, 0, static_cast<CBitmapRes*>(ResourceMgr::Instance().Load(Resolve(this->m_unchecked.c_str()))), false);
if (!this->ascendingText.empty()) {
this->DrawTextAt(0xc, 1, this->ascendingText.c_str(), 0, 0, 0xc, 0, 0, 0);
}
} else if (this->geometry.unknown_0030 == 1) {
} else if (this->geometry.state == 1) {
this->DrawBitmap(0, 0, static_cast<CBitmapRes*>(ResourceMgr::Instance().Load(Resolve(this->m_checked.c_str()))), false);
if (!this->descendingText.empty()) {
this->DrawTextAt(0xc, 1, this->descendingText.c_str(), 0, 0, 0xc, 0, 0, 0);