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

@ -40,9 +40,9 @@ namespace {
// FUNCTION: fn_10648
__declspec(noinline) UIBalloonText::UIBalloonText() : UIWindow(0) {
this->m_richText = 0;
this->unknown_007C = 0;
this->balloonFlag = 0;
this->m_fontHeight = 12;
this->geometry.unknown_0034 = 0;
this->geometry.animationFrame = 0;
this->m_textColor = 0xFFFFFF;
this->m_outlineColor = 0;
}
@ -62,7 +62,7 @@ bool UIBalloonText::CanHitTest() {
// OFFSET: 0x0085FAE0
// FUNCTION: fn_10882
void UIBalloonText::OnProcess() {
++this->geometry.unknown_0034;
++this->geometry.animationFrame;
}
// OFFSET: 0x00867F20
@ -292,7 +292,7 @@ void UINameBalloonText::SetIcon(const char* name, unsigned char framed) {
if (ResourceMgr::Instance().Exists(path)) {
this->iconName = path;
if (!framed) {
this->Resize(this->unknown_00B8 + 25, std::max(this->geometry.height, 24));
this->Resize(this->nameWidth + 25, std::max(this->geometry.height, 24));
this->Invalidate();
return;
}
@ -301,7 +301,7 @@ void UINameBalloonText::SetIcon(const char* name, unsigned char framed) {
}
if (framed == 1) {
this->Resize(this->unknown_00B8 + 29, std::max(this->geometry.height, 28));
this->Resize(this->nameWidth + 29, std::max(this->geometry.height, 28));
}
this->Invalidate();
@ -311,8 +311,8 @@ void UINameBalloonText::SetIcon(const char* name, unsigned char framed) {
UINameBalloonText::UINameBalloonText() : UIBalloonText(), monsterType(0), framed(0) {
this->m_textColor = 0xFFFFFF;
this->m_outlineColor = 0;
this->unknown_00B8 = 0;
this->unknown_0098 = 0;
this->nameWidth = 0;
this->textFlags = 0;
}
// OFFSET: 0x00CCDFF0
@ -334,16 +334,16 @@ void UINameBalloonText::SetName(const CActorNameCard& info, bool stripHash, unsi
}
if (g_serviceFlag05) {
if (std::strlen(info.unknown_007C.c_str()) != 0) {
this->m_lines.push_back(info.unknown_007C.c_str());
if (std::strlen(info.displayName.c_str()) != 0) {
this->m_lines.push_back(info.displayName.c_str());
}
if (std::strlen(info.unknown_004C.c_str()) == 0) {
this->unknown_00B8 = 0;
if (std::strlen(info.clanName.c_str()) == 0) {
this->nameWidth = 0;
} else {
char position[260];
std::memset(position, 0, sizeof(position));
strncpy_s(position, sizeof(position), info.unknown_004C.c_str(), info.unknown_004C.size());
strncpy_s(position, sizeof(position), info.clanName.c_str(), info.clanName.size());
if (g_forbiddenWords.Contains(position)) {
std::string masked;
g_forbiddenWords.Mask(position, &masked);
@ -353,20 +353,20 @@ void UINameBalloonText::SetName(const CActorNameCard& info, bool stripHash, unsi
this->m_lines.push_back(name.c_str());
} else {
if (std::strlen(info.unknown_007C.c_str()) != 0) {
this->m_lines.push_back(info.unknown_007C.c_str());
if (std::strlen(info.displayName.c_str()) != 0) {
this->m_lines.push_back(info.displayName.c_str());
}
if (std::strlen(info.unknown_0064.c_str()) != 0) {
name = FormatOwnedString("[%s] %s", info.unknown_0064.c_str(), name.c_str());
if (std::strlen(info.title.c_str()) != 0) {
name = FormatOwnedString("[%s] %s", info.title.c_str(), name.c_str());
}
if (std::strlen(info.unknown_001C.c_str()) == 0) {
if (std::strlen(info.partyName.c_str()) == 0) {
this->m_lines.push_back(name.c_str());
} else {
char party[260];
std::memset(party, 0, sizeof(party));
strncpy_s(party, sizeof(party), info.unknown_001C.c_str(), info.unknown_001C.size());
strncpy_s(party, sizeof(party), info.partyName.c_str(), info.partyName.size());
if (g_forbiddenWords.Contains(party)) {
std::string masked;
g_forbiddenWords.Mask(party, &masked);
@ -378,10 +378,10 @@ void UINameBalloonText::SetName(const CActorNameCard& info, bool stripHash, unsi
this->m_lines.push_back(line);
}
if (std::strlen(info.unknown_0034.c_str()) != 0) {
if (std::strlen(info.guildName.c_str()) != 0) {
char guild[260];
std::memset(guild, 0, sizeof(guild));
strncpy_s(guild, sizeof(guild), info.unknown_0034.c_str(), info.unknown_0034.size());
strncpy_s(guild, sizeof(guild), info.guildName.c_str(), info.guildName.size());
if (g_forbiddenWords.Contains(guild)) {
std::string masked = "";
g_forbiddenWords.Mask(guild, &masked);
@ -389,7 +389,7 @@ void UINameBalloonText::SetName(const CActorNameCard& info, bool stripHash, unsi
char position[260];
std::memset(position, 0, sizeof(position));
strncpy_s(position, sizeof(position), info.unknown_004C.c_str(), info.unknown_004C.size());
strncpy_s(position, sizeof(position), info.clanName.c_str(), info.clanName.size());
if (g_forbiddenWords.Contains(position)) {
std::string masked = "";
g_forbiddenWords.Mask(position, &masked);
@ -408,9 +408,9 @@ void UINameBalloonText::SetName(const CActorNameCard& info, bool stripHash, unsi
width = std::max(lineWidth, width);
}
this->unknown_00B8 = width;
this->nameWidth = width;
this->monsterType = monsterType;
if (monsterType == 0 || info.unknown_0094 != 0) {
if (monsterType == 0 || info.groupIconId != 0) {
this->Resize(width, static_cast<int>(this->m_lines.size()) * (g_nameBalloonFontHeight + 2) + 6);
} else {
const char* path;
@ -429,7 +429,7 @@ void UINameBalloonText::SetName(const CActorNameCard& info, bool stripHash, unsi
if (height < static_cast<std::size_t>(bitmap->image.height)) {
height = bitmap->image.height;
}
this->Resize(bitmap->image.width + this->unknown_00B8, static_cast<int>(height));
this->Resize(bitmap->image.width + this->nameWidth, static_cast<int>(height));
}
}
@ -446,9 +446,9 @@ void UINameBalloonText::AddNameLine(const char* text) {
this->m_lines.clear();
this->m_lines.push_back(std::string(text));
const std::string& last = this->m_lines.back();
this->unknown_00B8 =
this->nameWidth =
std::max(this->TextWidth(last.c_str(), last.size(), 0, g_nameBalloonFontHeight, g_serviceFlag06, 0) + 8, 32);
this->Resize(this->unknown_00B8, g_nameBalloonFontHeight + 8);
this->Resize(this->nameWidth, g_nameBalloonFontHeight + 8);
this->Invalidate();
}