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

@ -58,10 +58,10 @@ void CLevel150Effect::AddBubbleRing(int alphaOffset) {
}
particle->SetTexture(FormatOwnedString("effect\\W_bubble%02d.tga", segment + 1).c_str());
particle->unknown_0004 = this->id;
particle->unknown_0010 = ring;
particle->unknown_000C = segment;
particle->unknown_0008 = 4;
particle->effectId = this->id;
particle->rowIndex = ring;
particle->columnIndex = segment;
particle->groupIndex = 4;
particle->alpha = alphaOffset + (3 - ring) * 45;
if (effectId == 978) {
@ -74,21 +74,21 @@ void CLevel150Effect::AddBubbleRing(int alphaOffset) {
particle->SetColor(255, 155, 0);
}
*reinterpret_cast<float*>(&particle->unknown_00C4) = static_cast<float>((ring + 2) * 90 % 360);
particle->unknown_0050 = 360;
particle->unknown_00C0 = 30.0f - static_cast<float>(ring);
*reinterpret_cast<float*>(&particle->angleBits) = static_cast<float>((ring + 2) * 90 % 360);
particle->angleParameter = 360;
particle->speedParameter = 30.0f - static_cast<float>(ring);
particle->scale = 3.5f;
particle->unknown_004C = 80;
particle->unknown_0054 = 0.0f;
particle->unknown_00E8 = 0;
particle->phaseParameter = 80;
particle->animationParameter = 0.0f;
particle->elapsedFrames = 0;
const int index = particle->unknown_000C;
const float radius = particle->unknown_00C0 * g_sinTable[index * 9] * 0.15f + particle->unknown_00C0;
const int index = particle->columnIndex;
const float radius = particle->speedParameter * g_sinTable[index * 9] * 0.15f + particle->speedParameter;
const int direction =
static_cast<int>(static_cast<float>(static_cast<int>(static_cast<float>(particle->unknown_0050) / 20.0f) * index) +
*reinterpret_cast<const float*>(&particle->unknown_00C4)) %
static_cast<int>(static_cast<float>(static_cast<int>(static_cast<float>(particle->angleParameter) / 20.0f) * index) +
*reinterpret_cast<const float*>(&particle->angleBits)) %
360;
const int tilt = particle->unknown_004C;
const int tilt = particle->phaseParameter;
const float spread = radius * g_cosTable[tilt];
const float height = radius * g_sinTable[tilt];
const float cosine = g_cosTable[direction];
@ -136,21 +136,21 @@ void CLevel150Effect::AddShock(int kind) {
for (int index = 0; index < 2; ++index) {
CParticle* particle = CreateParticle(reinterpret_cast<const vector3d*>(this->position), 13);
if (particle) {
particle->unknown_0004 = this->id;
particle->unknown_000C = index;
particle->unknown_0010 = 0;
particle->unknown_0008 = 1;
particle->unknown_004C = index * 180;
particle->effectId = this->id;
particle->columnIndex = index;
particle->rowIndex = 0;
particle->groupIndex = 1;
particle->phaseParameter = index * 180;
particle->alpha = 200;
particle->unknown_0054 = -1.0f;
particle->unknown_00E8 = 0;
particle->animationParameter = -1.0f;
particle->elapsedFrames = 0;
if (kind == 3) {
particle->SetTexture("effect\\cir0002.tga");
*reinterpret_cast<float*>(particle->unknown_0058) = 18.0f;
*reinterpret_cast<float*>(particle->animationParameters) = 18.0f;
} else {
particle->SetTexture("effect\\emp shock.tga");
*reinterpret_cast<float*>(particle->unknown_0058) = 11.0f;
*reinterpret_cast<float*>(particle->animationParameters) = 11.0f;
}
this->shocks.push_back(particle);
@ -221,7 +221,7 @@ void CLevel150Effect::OnProcess() {
particle->position.z = this->position[2];
if (particle) {
int tilt = particle->unknown_004C - 1;
int tilt = particle->phaseParameter - 1;
float scale = particle->scale + 0.07f;
int alpha = particle->alpha;
if (tilt < 10) {
@ -242,17 +242,17 @@ void CLevel150Effect::OnProcess() {
particle->alpha = alpha;
particle->scale = scale;
particle->unknown_004C = tilt;
particle->phaseParameter = tilt;
const float radius = particle->unknown_00C0;
const int segment = particle->unknown_000C;
const float radius = particle->speedParameter;
const int segment = particle->columnIndex;
matrix transform;
std::memcpy(transform.values, g_identityMatrix, sizeof(transform.values));
transform.SetScale(scale * 0.5f, radius * g_sinTable[tilt] / (radius * g_sinTable[segment * 9] * 0.15f + radius), scale * 0.5f);
particle->transform = transform;
}
++particle->unknown_00E8;
++particle->elapsedFrames;
}
for (std::vector<CParticle*>::iterator it = this->shocks.begin(); it != this->shocks.end(); ++it) {
@ -262,15 +262,15 @@ void CLevel150Effect::OnProcess() {
particle->position.z = this->position[2];
if (particle) {
int tilt = particle->unknown_004C + 3;
int tilt = particle->phaseParameter + 3;
if (tilt >= 360) {
tilt -= 360;
}
particle->unknown_004C = tilt;
particle->phaseParameter = tilt;
const float size = *reinterpret_cast<const float*>(particle->unknown_0058);
const float size = *reinterpret_cast<const float*>(particle->animationParameters);
const float scale = size * 0.1f * g_sinTable[tilt] + 1.0f + size * 0.8f;
const int segment = particle->unknown_000C;
const int segment = particle->columnIndex;
CGameMode* mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode());
const int yaw = static_cast<int>(mode->camera->camera.yaw);
@ -287,7 +287,7 @@ void CLevel150Effect::OnProcess() {
particle->transform = result;
}
++particle->unknown_00E8;
++particle->elapsedFrames;
}
}
@ -296,13 +296,13 @@ void CLevel150Effect::OnProcess() {
void CLevel150Effect::Render() {
for (std::vector<CParticle*>::iterator it = this->bubbles.begin(); it != this->bubbles.end(); ++it) {
CParticle* particle = *it;
if (!particle || particle->unknown_000C <= 0) {
if (!particle || particle->columnIndex <= 0) {
continue;
}
const int segment = particle->unknown_000C;
const int segment = particle->columnIndex;
const ParticleQuad quad = {false, 0.0f, 1.0f, static_cast<float>(segment) / 21.0f, static_cast<float>(segment + 1) / 21.0f, false, true};
particle->SetTexture(FormatOwnedString("effect\\W_bubble%02d.tga", particle->unknown_00E8 % 27 + 1).c_str());
particle->SetTexture(FormatOwnedString("effect\\W_bubble%02d.tga", particle->elapsedFrames % 27 + 1).c_str());
particle->Render(quad);
}
@ -349,15 +349,15 @@ void CLevel150SubEffect::Init() {
}
particle->SetTexture("effect\\emp shock.tga");
*reinterpret_cast<float*>(&particle->unknown_00C4) = static_cast<float>(std::max(rand() % 360, 0));
*reinterpret_cast<float*>(&particle->angleBits) = static_cast<float>(std::max(rand() % 360, 0));
particle->alpha = 200;
particle->unknown_0054 = 10.0f;
*reinterpret_cast<float*>(particle->unknown_0058) = 10.0f;
particle->unknown_0004 = this->id;
particle->unknown_000C = index;
particle->unknown_0010 = ring;
particle->unknown_0008 = 1;
particle->unknown_00E8 = -20 * ring;
particle->animationParameter = 10.0f;
*reinterpret_cast<float*>(particle->animationParameters) = 10.0f;
particle->effectId = this->id;
particle->columnIndex = index;
particle->rowIndex = ring;
particle->groupIndex = 1;
particle->elapsedFrames = -20 * ring;
this->particles.push_back(particle);
if (effectId == 979) {
@ -404,24 +404,24 @@ void CLevel150SubEffect::OnProcess() {
particle->position.y = this->position[1];
particle->position.z = this->position[2];
if (particle && particle->unknown_00E8 > 0) {
float size = particle->unknown_0054 * 1.02;
if (particle && particle->elapsedFrames > 0) {
float size = particle->animationParameter * 1.02;
if (size > 20.0f) {
int alpha = particle->alpha - 3;
if (alpha <= 0) {
size = 10.0f;
*reinterpret_cast<float*>(&particle->unknown_00C4) = static_cast<float>(std::max(rand() % 360, 0));
*reinterpret_cast<float*>(&particle->angleBits) = static_cast<float>(std::max(rand() % 360, 0));
alpha = 200;
}
particle->alpha = alpha;
}
particle->unknown_0054 = size;
particle->animationParameter = size;
const int angle = static_cast<int>(*reinterpret_cast<const float*>(&particle->unknown_00C4));
const int angle = static_cast<int>(*reinterpret_cast<const float*>(&particle->angleBits));
CGameMode* mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode());
const int yaw = static_cast<int>(mode->camera->camera.yaw);
const float scale = particle->unknown_0054;
const float height = *reinterpret_cast<const float*>(particle->unknown_0058);
const float scale = particle->animationParameter;
const float height = *reinterpret_cast<const float*>(particle->animationParameters);
matrix rotation;
std::memcpy(rotation.values, g_identityMatrix, sizeof(rotation.values));
@ -439,7 +439,7 @@ void CLevel150SubEffect::OnProcess() {
particle->transform = result;
}
++particle->unknown_00E8;
++particle->elapsedFrames;
}
}