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

@ -98,12 +98,12 @@ std::vector<char> CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1
std::vector<char> packet;
std::string name = this->nameCard.Name(actor->render.accountId);
if (actor->render.unknown_0070 == 1) {
if (actor->render.state == 1) {
packet.resize(sizeof(ActorMoveEntryPacket));
ActorMoveEntryPacket* entry = reinterpret_cast<ActorMoveEntryPacket*>(packet.data());
entry->hp = actor->GetGaugeCurrent();
entry->maxHp = actor->GetGaugeMaximum();
entry->isBoss = actor->unknown_0304;
entry->isBoss = actor->hpGaugeFlags;
entry->moveStartTime = actor->routeStartTick;
int metadata = 0;
@ -133,8 +133,8 @@ std::vector<char> CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1
subY = 0;
}
const int destinationX = actor->unknown_0158[5];
const int destinationY = *reinterpret_cast<const int*>(actor->unknown_0170);
const int destinationX = actor->movementState[5];
const int destinationY = *reinterpret_cast<const int*>(actor->destinationAndSpeed);
entry->moveData[0] = static_cast<std::uint8_t>(cellX >> 2);
entry->moveData[1] = static_cast<std::uint8_t>((cellX << 6) | ((cellY >> 4) & 0x3F));
entry->moveData[2] = static_cast<std::uint8_t>((cellY << 4) | ((destinationX >> 6) & 0x0F));
@ -144,35 +144,35 @@ std::vector<char> CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1
entry->packetType = packetType;
entry->packetLength = static_cast<std::uint16_t>(name.size() + packet.size());
entry->objectType = actor->unknown_0314;
entry->objectType = actor->objectType;
entry->accountId = actor->render.accountId;
entry->speed = *reinterpret_cast<const std::uint16_t*>(actor->unknown_0170 + 4);
entry->speed = *reinterpret_cast<const std::uint16_t*>(actor->destinationAndSpeed + 4);
entry->bodyState = static_cast<std::uint16_t>(actor->bodyState);
entry->healthState = static_cast<std::uint16_t>(actor->unknown_02C4);
entry->healthState = static_cast<std::uint16_t>(actor->effectState);
entry->effectState = actor->GetStateFlags();
entry->job = static_cast<std::uint16_t>(actor->GetEffectiveJob(-1));
entry->head = *reinterpret_cast<const std::uint16_t*>(actor->unknown_029C);
entry->head = *reinterpret_cast<const std::uint16_t*>(actor->headType);
entry->guildId = actor->GetGdid();
entry->emblemVersion = static_cast<std::uint16_t>(g_guildMgr->GetEmblemVersion(actor->GetGdid()));
entry->isPkModeOn = actor->unknown_02C8 != 0;
entry->sex = static_cast<std::uint8_t>(actor->unknown_0260);
entry->xSize = static_cast<std::uint8_t>(actor->unknown_0294);
entry->ySize = static_cast<std::uint8_t>(actor->unknown_0298);
entry->level = actor->unknown_0210;
entry->font = static_cast<std::uint16_t>(actor->render.unknown_00FC);
entry->bodyPalette = static_cast<std::uint16_t>(actor->render.unknown_0048);
entry->isPkModeOn = actor->healthState != 0;
entry->sex = static_cast<std::uint8_t>(actor->sex);
entry->xSize = static_cast<std::uint8_t>(actor->xSize);
entry->ySize = static_cast<std::uint8_t>(actor->ySize);
entry->level = actor->characterLevel;
entry->font = static_cast<std::uint16_t>(actor->render.fontSequenceState);
entry->bodyPalette = static_cast<std::uint16_t>(actor->render.bodyPalette);
if (actor->unknown_0314 == 0) {
if (actor->objectType == 0) {
CPc* pc = static_cast<CPc*>(actor);
entry->honor = static_cast<std::uint16_t>(pc->unknown_0430);
entry->virtue = pc->unknown_0434;
entry->headDirection = static_cast<std::uint16_t>(pc->unknown_043C);
entry->weapon = pc->unknown_0434;
entry->accessory = static_cast<std::uint16_t>(pc->unknown_0450);
entry->accessory2 = static_cast<std::uint16_t>(pc->unknown_0454);
entry->accessory3 = static_cast<std::uint16_t>(pc->unknown_0458);
entry->headPalette = static_cast<std::uint16_t>(pc->unknown_0444);
entry->robe = static_cast<std::uint16_t>(pc->unknown_049C);
entry->honor = static_cast<std::uint16_t>(pc->honor);
entry->virtue = pc->virtue;
entry->headDirection = static_cast<std::uint16_t>(pc->headDir);
entry->weapon = pc->virtue;
entry->accessory = static_cast<std::uint16_t>(pc->accessory);
entry->accessory2 = static_cast<std::uint16_t>(pc->accessory2);
entry->accessory3 = static_cast<std::uint16_t>(pc->accessory3);
entry->headPalette = static_cast<std::uint16_t>(pc->headPalette);
entry->robe = static_cast<std::uint16_t>(pc->robe);
entry->characterId = pc->GetPkState();
entry->body = static_cast<std::uint16_t>(pc->GetBodyCostume());
}
@ -181,53 +181,53 @@ std::vector<char> CGameMode::BuildActorEntryPacket(CGameActor* actor, std::uint1
ActorStandEntryPacket* entry = reinterpret_cast<ActorStandEntryPacket*>(packet.data());
entry->hp = actor->GetGaugeCurrent();
entry->maxHp = actor->GetGaugeMaximum();
entry->isBoss = actor->unknown_0304;
entry->isBoss = actor->hpGaugeFlags;
const int direction = (static_cast<int>(actor->render.angle) + 180) / 45 % 8;
const int cellX = actor->unknown_0158[5];
const int cellY = *reinterpret_cast<const int*>(actor->unknown_0170);
const int cellX = actor->movementState[5];
const int cellY = *reinterpret_cast<const int*>(actor->destinationAndSpeed);
entry->posDir[0] = static_cast<std::uint8_t>(cellX >> 2);
entry->posDir[1] = static_cast<std::uint8_t>((cellX << 6) | ((cellY >> 4) & 0x3F));
entry->posDir[2] = static_cast<std::uint8_t>((cellY << 4) | (direction & 0x0F));
if (actor->render.unknown_0070 == 3) {
if (actor->render.state == 3) {
entry->state = 1;
} else {
entry->state = actor->render.unknown_0070 == 6 ? 2 : 0;
entry->state = actor->render.state == 6 ? 2 : 0;
}
entry->packetType = packetType;
entry->packetLength = static_cast<std::uint16_t>(name.size() + packet.size());
entry->objectType = actor->unknown_0314;
entry->objectType = actor->objectType;
entry->accountId = actor->render.accountId;
entry->speed = *reinterpret_cast<const std::uint16_t*>(actor->unknown_0170 + 4);
entry->speed = *reinterpret_cast<const std::uint16_t*>(actor->destinationAndSpeed + 4);
entry->bodyState = static_cast<std::uint16_t>(actor->bodyState);
entry->healthState = static_cast<std::uint16_t>(actor->unknown_02C4);
entry->healthState = static_cast<std::uint16_t>(actor->effectState);
entry->effectState = actor->GetStateFlags();
entry->job = static_cast<std::uint16_t>(actor->GetEffectiveJob(-1));
entry->head = *reinterpret_cast<const std::uint16_t*>(actor->unknown_029C);
entry->head = *reinterpret_cast<const std::uint16_t*>(actor->headType);
entry->guildId = actor->GetGdid();
entry->emblemVersion = static_cast<std::uint16_t>(g_guildMgr->GetEmblemVersion(actor->GetGdid()));
entry->isPkModeOn = actor->unknown_02C8 != 0;
entry->sex = static_cast<std::uint8_t>(actor->unknown_0260);
entry->xSize = static_cast<std::uint8_t>(actor->unknown_0294);
entry->ySize = static_cast<std::uint8_t>(actor->unknown_0298);
entry->level = actor->unknown_0210;
entry->font = static_cast<std::uint16_t>(actor->render.unknown_00FC);
entry->bodyPalette = static_cast<std::uint16_t>(actor->render.unknown_0048);
entry->isPkModeOn = actor->healthState != 0;
entry->sex = static_cast<std::uint8_t>(actor->sex);
entry->xSize = static_cast<std::uint8_t>(actor->xSize);
entry->ySize = static_cast<std::uint8_t>(actor->ySize);
entry->level = actor->characterLevel;
entry->font = static_cast<std::uint16_t>(actor->render.fontSequenceState);
entry->bodyPalette = static_cast<std::uint16_t>(actor->render.bodyPalette);
entry->emblemVersion = static_cast<std::uint16_t>(g_guildMgr->GetEmblemVersion(actor->GetGdid()));
if (actor->unknown_0314 == 0) {
if (actor->objectType == 0) {
CPc* pc = static_cast<CPc*>(actor);
entry->honor = static_cast<std::uint16_t>(pc->unknown_0430);
entry->virtue = pc->unknown_0434;
entry->headDirection = static_cast<std::uint16_t>(pc->unknown_043C);
entry->weapon = pc->unknown_0434;
entry->accessory = static_cast<std::uint16_t>(pc->unknown_0450);
entry->accessory2 = static_cast<std::uint16_t>(pc->unknown_0454);
entry->accessory3 = static_cast<std::uint16_t>(pc->unknown_0458);
entry->headPalette = static_cast<std::uint16_t>(pc->unknown_0444);
entry->robe = static_cast<std::uint16_t>(pc->unknown_049C);
entry->honor = static_cast<std::uint16_t>(pc->honor);
entry->virtue = pc->virtue;
entry->headDirection = static_cast<std::uint16_t>(pc->headDir);
entry->weapon = pc->virtue;
entry->accessory = static_cast<std::uint16_t>(pc->accessory);
entry->accessory2 = static_cast<std::uint16_t>(pc->accessory2);
entry->accessory3 = static_cast<std::uint16_t>(pc->accessory3);
entry->headPalette = static_cast<std::uint16_t>(pc->headPalette);
entry->robe = static_cast<std::uint16_t>(pc->robe);
entry->characterId = pc->GetPkState();
entry->body = static_cast<std::uint16_t>(pc->GetBodyCostume());
}