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

@ -164,9 +164,9 @@ void CGameMode::FindWalkableCellToward(float x, float z, float originX, float or
// OFFSET: 0x00CD0300
// FUNCTION: fn_21252
void CGameMode::RemoveMiniMapPing(std::uint32_t id) {
const auto found = this->unknown_01C4.find(id);
if (found != this->unknown_01C4.end()) {
this->unknown_01C4.erase(found);
const auto found = this->compassPosList.find(id);
if (found != this->compassPosList.end()) {
this->compassPosList.erase(found);
}
}
@ -175,11 +175,11 @@ void CGameMode::RemoveMiniMapPing(std::uint32_t id) {
void CGameMode::DrawMiniMapMembers(const TextureRegion& view) {
int index = 0;
if (g_windowMgr.window_4F1CC) {
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_MARK_COUNT, 0, this->unknown_01B4.size(), 0, 0);
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_MARK_COUNT, 1, this->unknown_01BC.size(), 0, 0);
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_MARK_COUNT, 0, this->partyPosList.size(), 0, 0);
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_MARK_COUNT, 1, this->guildPosList.size(), 0, 0);
}
for (auto it = this->unknown_01B4.begin(); it != this->unknown_01B4.end(); ++it) {
for (auto it = this->partyPosList.begin(); it != this->partyPosList.end(); ++it) {
this->DrawMiniMapMarker(view, it->second.x, it->second.y, 2, std::string(), 2, it->second.color, false);
if (g_windowMgr.window_4F1CC) {
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_MARK_POS, 0, index, it->second.x, it->second.y);
@ -187,8 +187,8 @@ void CGameMode::DrawMiniMapMembers(const TextureRegion& view) {
++index;
}
for (auto it = this->unknown_01BC.begin(); it != this->unknown_01BC.end(); ++it) {
if (this->unknown_01B4.find(it->first) == this->unknown_01B4.end()) {
for (auto it = this->guildPosList.begin(); it != this->guildPosList.end(); ++it) {
if (this->partyPosList.find(it->first) == this->partyPosList.end()) {
this->DrawMiniMapMarker(view, it->second.x, it->second.y, 2, std::string(), 1, it->second.color, false);
if (g_windowMgr.window_4F1CC) {
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_MARK_POS, 1, index, it->second.x, it->second.y);
@ -198,16 +198,16 @@ void CGameMode::DrawMiniMapMembers(const TextureRegion& view) {
}
for (auto it = this->minimapMarkers.begin(); it != this->minimapMarkers.end(); ++it) {
if (it->second.unknown_0006 != 0) {
const std::string name = FormatOwnedString("유저인터페이스\\basic_interface\\quest_%d.bmp", it->second.unknown_0006);
this->DrawMiniMapMarker(view, it->second.unknown_0000, it->second.unknown_0002, 4, name, 0, 0, true);
if (it->second.questIconId != 0) {
const std::string name = FormatOwnedString("유저인터페이스\\basic_interface\\quest_%d.bmp", it->second.questIconId);
this->DrawMiniMapMarker(view, it->second.x, it->second.y, 4, name, 0, 0, true);
}
}
if (g_session.unknown_5BE8 > -1) {
const int y = g_session.unknown_5BEC;
if (g_session.storeSearchX > -1) {
const int y = g_session.storeSearchY;
if (y > -1) {
this->DrawMiniMapMarker(view, g_session.unknown_5BE8, y, 4, "유저인터페이스\\basic_interface\\search_store.bmp", 0, 0, true);
this->DrawMiniMapMarker(view, g_session.storeSearchX, y, 4, "유저인터페이스\\basic_interface\\search_store.bmp", 0, 0, true);
}
}
}
@ -215,7 +215,7 @@ void CGameMode::DrawMiniMapMembers(const TextureRegion& view) {
// OFFSET: 0x00CD0DD0
// FUNCTION: fn_21255
void CGameMode::DrawMiniMap() {
if (!g_windowMgr.unknown_01C0) {
if (!g_windowMgr.minimapZoomWnd) {
return;
}
@ -227,7 +227,7 @@ void CGameMode::DrawMiniMap() {
int row;
this->WorldCell(player->render.position.x, player->render.position.z, column, row);
const float half = 1.0f / (g_windowMgr.unknown_0050 * 2.0f);
const float half = 1.0f / (g_windowMgr.minimapZoom * 2.0f);
const float u = static_cast<float>(column) / static_cast<float>(width);
const float v = static_cast<float>(height - row) / static_cast<float>(height);
TextureRegion view;
@ -266,13 +266,13 @@ void CGameMode::DrawMiniMap() {
const int reduction = g_textureReduction;
g_textureReduction = 1;
CTexture* texture = g_texMgr.Load(reinterpret_cast<const char*>(this->unknown_0090), 0, false, true, false);
CTexture* texture = g_texMgr.Load(reinterpret_cast<const char*>(this->minimapBmpName), 0, false, true, false);
RECT rect;
rect.left = static_cast<int>(centerX - 64.0f);
rect.top = 16;
rect.right = static_cast<int>(centerX + 64.0f);
rect.bottom = 144;
this->DrawTexture(rect, 0, 0.0998f, g_windowMgr.unknown_005C, texture, view);
this->DrawTexture(rect, 0, 0.0998f, g_windowMgr.minimapColor, texture, view);
this->DrawMiniMapMarker(view, column, row, 5, "유저인터페이스\\map\\map_arrow.bmp", 4, 0xFFFFFFFF, false);
@ -285,11 +285,11 @@ void CGameMode::DrawMiniMap() {
}
}
if (this->unknown_05CC[0]) {
this->DrawMiniMapMarker(view, this->unknown_05C4, this->unknown_05C8, 6, "유저인터페이스\\map\\bossmonster.bmp", 5, 0, true);
if (this->bossAlarmAndCopyNameFlags[0]) {
this->DrawMiniMapMarker(view, this->bossMonsterX, this->bossMonsterY, 6, "유저인터페이스\\map\\bossmonster.bmp", 5, 0, true);
}
if (g_windowMgr.unknown_0054) {
if (g_windowMgr.minimapMarkersVisible) {
for (int index = 0;; ++index) {
const TownInfo info = g_townInfoMgr->GetTownInfo(std::string(this->mapName), index);
if (info.image.size() == 0 || info.type == 8 || info.type == 9) {
@ -301,15 +301,15 @@ void CGameMode::DrawMiniMap() {
this->DrawMiniMapMembers(view);
if (this->unknown_01C4.size() != 0) {
for (auto it = this->unknown_01C4.begin(); it != this->unknown_01C4.end();) {
if (this->compassPosList.size() != 0) {
for (auto it = this->compassPosList.begin(); it != this->compassPosList.end();) {
if (it->second.persistent == 0 && timeGetTime() > it->second.tick + 15000) {
it = this->unknown_01C4.erase(it);
it = this->compassPosList.erase(it);
} else {
++it;
}
}
for (auto it = this->unknown_01C4.begin(); it != this->unknown_01C4.end(); ++it) {
for (auto it = this->compassPosList.begin(); it != this->compassPosList.end(); ++it) {
if (static_cast<int>(timeGetTime() - it->second.tick) % 1000 < 500) {
this->DrawMiniMapMarker(view, it->second.x, it->second.y, 1, std::string(""), 3, it->second.color, false);
}
@ -487,7 +487,7 @@ void CGameMode::DrawMiniMapMarker(
if (g_windowMgr.window_4F1CC) {
g_windowMgr.window_4F1CC->SendMsg(nullptr, UM_MINIMAP_SET_PLAYER_POS, x, y, 0, 0);
}
if (UIWindow* window = reinterpret_cast<UIWindow*>(g_windowMgr.unknown_01C0)) {
if (UIWindow* window = reinterpret_cast<UIWindow*>(g_windowMgr.minimapZoomWnd)) {
window->Invalidate();
}
}
@ -579,11 +579,11 @@ int g_minimapCoordinateDigitValues[4];
// OFFSET: 0x00CD2A10
// FUNCTION: fn_21261
void CGameMode::DrawMiniMapNumber() {
if (this->unknown_0408 == nullptr || this->unknown_0414 == 0) {
if (this->skillUseType == nullptr || this->skillUseLevel == 0) {
return;
}
const int number = this->unknown_0414;
const int number = this->skillUseLevel;
if (number != g_minimapCoordinateValue) {
g_minimapCoordinateValue = number;
int value = number;
@ -734,12 +734,12 @@ void CGameMode::DrawTimeAttackCountdown(std::uint32_t value, int mode) {
std::uint32_t remaining = 0;
switch (mode) {
case 0:
if (this->unknown_0464 == 0) {
this->unknown_0464 = timeGetTime();
if (this->countdownStartTick == 0) {
this->countdownStartTick = timeGetTime();
}
remaining = value;
if (timeGetTime() - this->unknown_0464 > 5000) {
this->unknown_0464 = 0;
if (timeGetTime() - this->countdownStartTick > 5000) {
this->countdownStartTick = 0;
g_session.m_timeAttackVisible = 0;
}
break;
@ -936,7 +936,7 @@ int CGameMode::UpdateMiniMapTooltip() {
int id = tooltipId;
if (id > 9 || id == -1) {
this->RefreshMiniMapTooltips();
if (tooltipId == -1 && g_windowMgr.unknown_0348 != nullptr) {
if (tooltipId == -1 && g_windowMgr.illustWnd != nullptr) {
return g_windowMgr.CloseWindow(WID_ILLUSTWND);
}
return tooltipId;
@ -946,7 +946,7 @@ int CGameMode::UpdateMiniMapTooltip() {
return id;
}
UIWindow* window = g_windowMgr.unknown_0348;
UIWindow* window = g_windowMgr.illustWnd;
if (window == nullptr) {
window = g_windowMgr.EnsureWindow(WID_ILLUSTWND);
g_miniMapTooltipId = tooltipId;