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:
parent
d7d87febd6
commit
dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
|
|
@ -22,21 +22,21 @@ void CRedLineEffect::CreateLines(int layer) {
|
|||
CParticle* particle = CreateParticle(reinterpret_cast<const vector3d*>(this->position), 5);
|
||||
if (particle) {
|
||||
particle->SetTexture("effect\\ring_red.tga");
|
||||
particle->unknown_0010 = row;
|
||||
particle->unknown_0004 = this->id;
|
||||
particle->unknown_000C = segment;
|
||||
particle->unknown_0008 = 3;
|
||||
particle->unknown_0050 = 360;
|
||||
*reinterpret_cast<float*>(&particle->unknown_00C4) = static_cast<float>(angle);
|
||||
particle->rowIndex = row;
|
||||
particle->effectId = this->id;
|
||||
particle->columnIndex = segment;
|
||||
particle->groupIndex = 3;
|
||||
particle->angleParameter = 360;
|
||||
*reinterpret_cast<float*>(&particle->angleBits) = static_cast<float>(angle);
|
||||
particle->alpha = 150;
|
||||
particle->unknown_00C0 = 120.0f;
|
||||
particle->unknown_004C = 90;
|
||||
particle->speedParameter = 120.0f;
|
||||
particle->phaseParameter = 90;
|
||||
particle->scale = scale;
|
||||
particle->unknown_00D0 = directionX;
|
||||
particle->unknown_00D8 = directionZ;
|
||||
particle->unknown_00D4 = 0.0f;
|
||||
particle->unknown_00E8 = life;
|
||||
particle->unknown_0054 = static_cast<float>(layer);
|
||||
particle->offsetX = directionX;
|
||||
particle->offsetZ = directionZ;
|
||||
particle->offsetY = 0.0f;
|
||||
particle->elapsedFrames = life;
|
||||
particle->animationParameter = static_cast<float>(layer);
|
||||
InitParticleQuad(particle->vertices);
|
||||
this->lines.push_back(particle);
|
||||
}
|
||||
|
|
@ -61,7 +61,7 @@ void CRedLineEffect::Close() {
|
|||
void CRedLineEffect::Open() {
|
||||
this->CreateLines(0);
|
||||
this->CreateLines(1);
|
||||
this->unknown_002C = 75;
|
||||
this->effectLifetime = 75;
|
||||
}
|
||||
|
||||
// OFFSET: 0x00B71BE0
|
||||
|
|
@ -81,9 +81,9 @@ void CRedLineEffect::OnProcess() {
|
|||
position.z = this->position[2];
|
||||
|
||||
if (particle != nullptr) {
|
||||
float& spinAngle = *reinterpret_cast<float*>(&particle->unknown_00C4);
|
||||
float& spinAngle = *reinterpret_cast<float*>(&particle->angleBits);
|
||||
float spin = spinAngle + 1.0f;
|
||||
const int age = particle->unknown_00E8;
|
||||
const int age = particle->elapsedFrames;
|
||||
|
||||
if (spin >= 360.0f) {
|
||||
spin -= 360.0f;
|
||||
|
|
@ -97,33 +97,33 @@ void CRedLineEffect::OnProcess() {
|
|||
if (age < 100) {
|
||||
width = 0.0f;
|
||||
} else if (age <= 115) {
|
||||
width = g_sinTable[(age - 100) * 6] * particle->unknown_00C0;
|
||||
width = g_sinTable[(age - 100) * 6] * particle->speedParameter;
|
||||
} else {
|
||||
width = particle->unknown_00C0;
|
||||
width = particle->speedParameter;
|
||||
}
|
||||
} else {
|
||||
const float shrunk = particle->unknown_00C0 - 5.0f;
|
||||
const float shrunk = particle->speedParameter - 5.0f;
|
||||
const int alpha = particle->alpha - 15;
|
||||
particle->alpha = alpha < 0 ? 0 : alpha;
|
||||
particle->unknown_00C0 = shrunk < 0.0f ? 0.0f : shrunk;
|
||||
width = particle->unknown_00C0;
|
||||
particle->speedParameter = shrunk < 0.0f ? 0.0f : shrunk;
|
||||
width = particle->speedParameter;
|
||||
}
|
||||
|
||||
if (width < 0.0f) {
|
||||
width = 0.0f;
|
||||
}
|
||||
|
||||
const int segment = particle->unknown_000C;
|
||||
const int step = static_cast<int>(static_cast<float>(particle->unknown_0050) / 20.0f);
|
||||
const int segment = particle->columnIndex;
|
||||
const int step = static_cast<int>(static_cast<float>(particle->angleParameter) / 20.0f);
|
||||
const int angle = static_cast<int>(static_cast<float>(step * segment) + spin) % 360;
|
||||
const float flat = width * g_cosTable[particle->unknown_004C];
|
||||
const float rise = width * g_sinTable[particle->unknown_004C];
|
||||
const float flat = width * g_cosTable[particle->phaseParameter];
|
||||
const float rise = width * g_sinTable[particle->phaseParameter];
|
||||
|
||||
vector3d points[2]{};
|
||||
points[0].x = particle->scale * g_cosTable[angle];
|
||||
points[0].z = particle->scale * g_sinTable[angle];
|
||||
|
||||
if (particle->unknown_0054 == 1.0f) {
|
||||
if (particle->animationParameter == 1.0f) {
|
||||
points[0].x *= 1.5f;
|
||||
points[0].z *= 1.5f;
|
||||
}
|
||||
|
|
@ -132,12 +132,12 @@ void CRedLineEffect::OnProcess() {
|
|||
points[1].y = points[0].y - rise;
|
||||
points[1].z = flat * g_sinTable[angle] + points[0].z;
|
||||
|
||||
points[0].x += particle->unknown_00D0;
|
||||
points[0].y += particle->unknown_00D4;
|
||||
points[0].z += particle->unknown_00D8;
|
||||
points[1].x += particle->unknown_00D0;
|
||||
points[1].y += particle->unknown_00D4;
|
||||
points[1].z += particle->unknown_00D8;
|
||||
points[0].x += particle->offsetX;
|
||||
points[0].y += particle->offsetY;
|
||||
points[0].z += particle->offsetZ;
|
||||
points[1].x += particle->offsetX;
|
||||
points[1].y += particle->offsetY;
|
||||
points[1].z += particle->offsetZ;
|
||||
|
||||
particle->vertices[1].x = points[1].x;
|
||||
particle->vertices[1].y = points[1].y;
|
||||
|
|
@ -159,7 +159,7 @@ void CRedLineEffect::OnProcess() {
|
|||
this->previousOuter = points[1];
|
||||
}
|
||||
|
||||
++particle->unknown_00E8;
|
||||
++particle->elapsedFrames;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -169,11 +169,11 @@ void CRedLineEffect::Render() {
|
|||
for (std::vector<CParticle*>::iterator it = this->lines.begin(); it != this->lines.end(); ++it) {
|
||||
CParticle* particle = *it;
|
||||
|
||||
if (particle && particle->unknown_000C > 0) {
|
||||
if (particle && particle->columnIndex > 0) {
|
||||
int blend;
|
||||
short shade;
|
||||
|
||||
if (particle->unknown_0054 == 0.0f) {
|
||||
if (particle->animationParameter == 0.0f) {
|
||||
shade = 10;
|
||||
blend = 6;
|
||||
} else {
|
||||
|
|
@ -184,7 +184,7 @@ void CRedLineEffect::Render() {
|
|||
particle->destinationBlend = blend;
|
||||
particle->SetColor(255, shade, shade);
|
||||
|
||||
const int segment = particle->unknown_000C;
|
||||
const int segment = particle->columnIndex;
|
||||
const ParticleQuad quad = {false, 0.0f, 1.0f, static_cast<float>(segment - 1) / 21.0f, static_cast<float>(segment) / 21.0f, false, true};
|
||||
particle->Render(quad);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue