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

@ -22,7 +22,7 @@ GuildInfo::GuildInfo() {
// OFFSET: 0x00AE40C0
// FUNCTION: fn_18029
void GuildInfo::AddUnknown00EC(const Unknown00ECEntry& entry) {
this->unknown_00EC.push_back(entry);
this->bannedMembers.push_back(entry);
g_windowMgr.RefreshGuildWindows();
}
@ -41,7 +41,7 @@ void GuildInfo::ChangeMemberPosition(int aid, int cid, int position) {
// OFFSET: 0x00AE4230
// FUNCTION: fn_18031
void GuildInfo::ClearUnknown0114() {
this->unknown_0114.clear();
this->agitIds.clear();
}
// OFFSET: 0x00AE4240
@ -53,9 +53,9 @@ void GuildInfo::ClearMembers() {
// OFFSET: 0x00AE4270
// FUNCTION: fn_18033
void GuildInfo::RemoveUnknown0114(int value) {
for (auto it = this->unknown_0114.begin(); it != this->unknown_0114.end(); ++it) {
for (auto it = this->agitIds.begin(); it != this->agitIds.end(); ++it) {
if (*it == value) {
this->unknown_0114.erase(it);
this->agitIds.erase(it);
return;
}
}
@ -64,9 +64,9 @@ void GuildInfo::RemoveUnknown0114(int value) {
// OFFSET: 0x00AE42C0
// FUNCTION: fn_18034
void GuildInfo::RemoveRelatedGuild(int unknown_0000, int unknown_0004) {
for (auto it = this->unknown_00E4.begin(); it != this->unknown_00E4.end(); ++it) {
if (it->unknown_0000 == unknown_0000 && it->unknown_0004 == unknown_0004) {
this->unknown_00E4.erase(it);
for (auto it = this->relatedGuilds.begin(); it != this->relatedGuilds.end(); ++it) {
if (it->guildId == unknown_0000 && it->relation == unknown_0004) {
this->relatedGuilds.erase(it);
g_windowMgr.RefreshGuildWindows();
return;
}
@ -87,15 +87,15 @@ int GuildInfo::GetMemberAccountId(const char* name) {
// OFFSET: 0x00AE43E0
// FUNCTION: fn_18036
int GuildInfo::GetUnknown0114(int index) {
return this->unknown_0114[index];
return this->agitIds[index];
}
// OFFSET: 0x00AE4690
// FUNCTION: fn_18037
int GuildInfo::CountRelatedGuilds(int unknown_0004) {
int count = 0;
for (auto it = this->unknown_00E4.begin(); it != this->unknown_00E4.end(); ++it) {
if (it->unknown_0004 == unknown_0004) {
for (auto it = this->relatedGuilds.begin(); it != this->relatedGuilds.end(); ++it) {
if (it->relation == unknown_0004) {
++count;
}
}
@ -105,7 +105,7 @@ int GuildInfo::CountRelatedGuilds(int unknown_0004) {
// OFFSET: 0x00AE46C0
// FUNCTION: fn_18038
int GuildInfo::GetUnknown0114Count() {
return static_cast<int>(this->unknown_0114.size());
return static_cast<int>(this->agitIds.size());
}
// OFFSET: 0x00AE4740
@ -118,48 +118,48 @@ void GuildInfo::Init() {
static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene->player->SetGdid(0);
}
this->unknown_00AC = 0;
this->unknown_00B0 = 0;
this->unknown_00B4 = 0;
this->unknown_00D0 = 0;
this->unknown_00B8 = 0;
this->unknown_00A4 = -1;
this->unknown_00BC = 0;
this->unknown_00C0 = 0;
this->unknown_00C4 = 0;
this->unknown_00C8 = 0;
this->unknown_00CC = 0;
this->unknown_0000.clear();
this->unknown_0018.clear();
this->unknown_0030.clear();
this->unknown_0048.clear();
this->unknown_0060 = 0;
this->unknown_0064 = 0;
this->unknown_006C = 0;
this->unknown_0070 = 0;
this->unknown_0074.clear();
this->unknown_008C = 0;
this->unknown_0090 = 0;
this->unknown_0094 = 0;
this->unknown_0098 = 0;
this->unknown_009C = 0;
this->unknown_00A0 = 0;
this->unknown_00D4.clear();
this->canInvite = 0;
this->canExpel = 0;
this->isMaster = 0;
this->masterCharacterId = 0;
this->requestState = 0;
this->guildTabBitmask = -1;
this->infoRequested = 0;
this->membersRequested = 0;
this->positionsRequested = 0;
this->skillsRequested = 0;
this->bansRequested = 0;
this->guildName.clear();
this->masterName.clear();
this->subject.clear();
this->notice.clear();
this->guildLevel = 0;
this->memberCount = 0;
this->maxMemberCount = 0;
this->memberAverageLevel = 0;
this->manageLand.clear();
this->exp = 0;
this->nextExp = 0;
this->emblem = 0;
this->points = 0;
this->honor = 0;
this->virtue = 0;
this->positions.clear();
this->m_members.clear();
this->unknown_00E4.clear();
this->unknown_00EC.clear();
this->unknown_00F4.clear();
this->relatedGuilds.clear();
this->bannedMembers.clear();
this->guildList.clear();
this->m_positions.clear();
this->unknown_0104.clear();
this->unknown_010C.clear();
this->unknown_0114.clear();
this->pendingMemberPositions.clear();
this->pendingPositionChanges.clear();
this->agitIds.clear();
}
// OFFSET: 0x00AE49F0
// FUNCTION: fn_18040
bool GuildInfo::HasRelatedGuild(int unknown_0000) {
for (auto it = this->unknown_00E4.begin(); it != this->unknown_00E4.end(); ++it) {
if (it->unknown_0000 == unknown_0000 && it->unknown_0004 == 0) {
for (auto it = this->relatedGuilds.begin(); it != this->relatedGuilds.end(); ++it) {
if (it->guildId == unknown_0000 && it->relation == 0) {
return true;
}
}
@ -219,8 +219,8 @@ int GuildInfo::DeleteMember(const char* name) {
// OFFSET: 0x00AE4D30
// FUNCTION: fn_18044
void GuildInfo::UpdateCharacterName(int characterId, const char* name) {
if (this->unknown_00D0 == characterId) {
this->unknown_0018 = name;
if (this->masterCharacterId == characterId) {
this->masterName = name;
}
std::string unknownName = LookupMessage(MSI_NAMELESS_USER);
@ -233,7 +233,7 @@ void GuildInfo::UpdateCharacterName(int characterId, const char* name) {
}
}
for (auto it = this->unknown_00EC.begin(); it != this->unknown_00EC.end(); ++it) {
for (auto it = this->bannedMembers.begin(); it != this->bannedMembers.end(); ++it) {
if (it->characterId == characterId) {
if (it->name.empty() || it->name == unknownName) {
it->name = name;
@ -252,9 +252,9 @@ void GuildInfo::UpdateCharacterName(int characterId, const char* name) {
void GuildInfo::UpdateMemberStatus(int accountId, int online, int characterId, short unknown_002C, short unknown_0020, short unknown_0024) {
for (auto it = this->m_members.begin(); it != this->m_members.end(); ++it) {
if (characterId == it->characterId) {
it->unknown_002C = unknown_002C;
it->unknown_0020 = unknown_0020;
it->unknown_0024 = unknown_0024;
it->sex = unknown_002C;
it->head = unknown_0020;
it->headPalette = unknown_0024;
it->online = online;
break;
}
@ -266,7 +266,7 @@ void GuildInfo::UpdateMemberStatus(int accountId, int online, int characterId, s
++count;
}
}
this->unknown_0068 = count;
this->onlineMemberCount = count;
g_windowMgr.RefreshGuildWindows();
}
@ -286,22 +286,22 @@ void GuildInfo::SetMemberOnline(int accountId, int online) {
++count;
}
}
this->unknown_0068 = count;
this->onlineMemberCount = count;
g_windowMgr.RefreshGuildWindows();
}
// OFFSET: 0x00AE5030
// FUNCTION: fn_18047
void GuildInfo::SetMasterCharacterId(int characterId) {
this->unknown_00D0 = characterId;
this->unknown_00B4 = characterId == static_cast<int>(g_session.m_gid);
this->masterCharacterId = characterId;
this->isMaster = characterId == static_cast<int>(g_session.m_gid);
}
// OFFSET: 0x00AE5090
// FUNCTION: fn_18048
void GuildInfo::UpdateUnknown00D4(Unknown00D4Entry entry) {
for (auto it = this->unknown_00D4.begin(); it != this->unknown_00D4.end(); ++it) {
if (it->unknown_0004 == entry.unknown_0004) {
for (auto it = this->positions.begin(); it != this->positions.end(); ++it) {
if (it->positionId == entry.positionId) {
*it = entry;
return;
}
@ -311,13 +311,13 @@ void GuildInfo::UpdateUnknown00D4(Unknown00D4Entry entry) {
// OFFSET: 0x00AE3F40
// FUNCTION: fn_18027
void GuildInfo::AddUnknown0114(int value) {
const auto found = std::find_if(this->unknown_0114.begin(), this->unknown_0114.end(),
const auto found = std::find_if(this->agitIds.begin(), this->agitIds.end(),
[value](int entry) { return value == entry; });
if (found != this->unknown_0114.end()) {
if (found != this->agitIds.end()) {
return;
}
this->unknown_0114.push_back(value);
this->agitIds.push_back(value);
}
// OFFSET: 0x00AE3FA0