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

@ -293,31 +293,31 @@ void CEZ2STREffectEx::Open() {
emitter->offset.x = info->offsetX;
emitter->offset.y = info->offsetY;
emitter->offset.z = 0.0f;
if (info->unknown_0024 & 1) {
if (info->flags & 1) {
this->retained = 1;
emitter->looping = 1;
}
emitter->duration = info->unknown_0040[1];
this->frameStep = info->unknown_0040[1] / 16;
if (!info->unknown_0028.empty()) {
this->AddEvent(0, info->unknown_0028.c_str(), this->frameStep + 1, 0);
emitter->duration = info->delays[1];
this->frameStep = info->delays[1] / 16;
if (!info->soundPath.empty()) {
this->AddEvent(0, info->soundPath.c_str(), this->frameStep + 1, 0);
}
if (info->unknown_0040[0] >= 0) {
this->AddEvent(1, nullptr, info->unknown_0040[0], 0);
if (info->delays[0] >= 0) {
this->AddEvent(1, nullptr, info->delays[0], 0);
}
if (info->unknown_0024 & 2) {
if (info->flags & 2) {
particle->flags = 0xD;
}
if (info->unknown_0024 & 4) {
if (info->flags & 4) {
particle->flags = 0x205;
}
emitter->unknown_3FEA = (info->unknown_0024 >> 3) & 1;
emitter->unknown_3FEB = (info->unknown_0024 >> 4) & 1;
emitter->repeatFrame = (info->flags >> 3) & 1;
emitter->followGround = (info->flags >> 4) & 1;
this->emitter = emitter;
}
@ -355,7 +355,7 @@ void CEZ2STREffectEx::OnProcess() {
this->emitter->remainingTime -= 0.05f;
}
if (this->emitter->unknown_3FEB) {
if (this->emitter->followGround) {
CGameMode* mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode());
this->position[1] = mode->scene->terrain->Height(this->position[0], this->position[2]);
}
@ -377,7 +377,7 @@ void CEZ2STREffectEx::OnProcess() {
reinterpret_cast<CEZ2STRParticle*>(emitter)->Process(0.0f, 0.0f, 0.0f);
}
if (this->emitter->unknown_3FEA == 1 && this->emitter->unknown_3F58 == 1) {
if (this->emitter->repeatFrame == 1 && this->emitter->playbackState == 1) {
this->frame = this->frameStep;
}
@ -410,7 +410,7 @@ void CEZ2STREffectEx::SetAlpha(float argument) {
// FUNCTION: fn_06973
void CEZ2STREffectEx::SetFlipX(int argument) {
if (this->emitter) {
this->emitter->unknown_3FE8 = static_cast<unsigned char>(argument);
this->emitter->flipX = static_cast<unsigned char>(argument);
}
}
@ -418,7 +418,7 @@ void CEZ2STREffectEx::SetFlipX(int argument) {
// FUNCTION: fn_06974
void CEZ2STREffectEx::SetFlipY(int argument) {
if (this->emitter) {
this->emitter->unknown_3FE9 = static_cast<unsigned char>(argument);
this->emitter->flipY = static_cast<unsigned char>(argument);
}
}
@ -441,7 +441,7 @@ void CEZ2STREffectEx::EnableGroundRender() {
// FUNCTION: fn_06977
void CEZ2STREffectEx::SetLifeTime(int argument) {
if (this->emitter) {
this->emitter->unknown_3F98 = argument;
this->emitter->lifetimeLimit = argument;
}
}
@ -449,7 +449,7 @@ void CEZ2STREffectEx::SetLifeTime(int argument) {
// FUNCTION: fn_06978
void CEZ2STREffectEx::SetAngle(float argument) {
if (this->emitter) {
this->emitter->unknown_3FA4 = argument;
this->emitter->rotationAngle = argument;
}
}
@ -457,7 +457,7 @@ void CEZ2STREffectEx::SetAngle(float argument) {
// FUNCTION: fn_06979
void CEZ2STREffectEx::SetPitch(float argument) {
if (this->emitter) {
this->emitter->unknown_3FA8 = argument;
this->emitter->pitch = argument;
}
}
@ -465,7 +465,7 @@ void CEZ2STREffectEx::SetPitch(float argument) {
// FUNCTION: fn_06980
void CEZ2STREffectEx::SetYaw(float argument) {
if (this->emitter) {
this->emitter->unknown_3FAC = argument;
this->emitter->yaw = argument;
}
}
@ -473,7 +473,7 @@ void CEZ2STREffectEx::SetYaw(float argument) {
// FUNCTION: fn_06981
void CEZ2STREffectEx::SetScale(float argument) {
if (this->emitter) {
this->emitter->unknown_3FB0 = argument;
this->emitter->scale = argument;
}
}
@ -500,24 +500,24 @@ void CEZ2STREffectMgr::InfoInserter::operator()(const std::pair<const std::strin
info.id = static_cast<int>(this->manager->effects.size());
info.name = static_cast<const std::string&>(FromUtf8(record.name, g_textCodePage));
info.offsetX = static_cast<float>(record.offsetX);
if (record.unknown_0028) {
info.unknown_0024 |= 1;
if (record.infinite) {
info.flags |= 1;
}
if (record.unknown_0029) {
info.unknown_0024 |= 2;
if (record.floor) {
info.flags |= 2;
}
info.offsetY = static_cast<float>(record.offsetY);
if (record.unknown_002A) {
info.unknown_0024 |= 4;
if (record.aboveUi) {
info.flags |= 4;
}
info.unknown_0028 = static_cast<const std::string&>(FromUtf8(record.unknown_002C, g_textCodePage));
if (record.unknown_0044) {
info.unknown_0024 |= 8;
info.soundPath = static_cast<const std::string&>(FromUtf8(record.soundPath, g_textCodePage));
if (record.soundLoop) {
info.flags |= 8;
}
info.unknown_0040[0] = record.unknown_0048[0];
info.unknown_0040[1] = record.unknown_0048[1];
if (record.unknown_0050) {
info.unknown_0024 |= 16;
info.delays[0] = record.delays[0];
info.delays[1] = record.delays[1];
if (record.toGround) {
info.flags |= 16;
}
std::string key = FromUtf8(entry.first, g_textCodePage);