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
|
|
@ -20,27 +20,27 @@ void CSaintCastingEffect::AddRing(const char* texture, int alpha) {
|
|||
continue;
|
||||
}
|
||||
|
||||
particle->unknown_0004 = this->id;
|
||||
particle->unknown_000C = segment;
|
||||
particle->unknown_0010 = ring;
|
||||
particle->unknown_0008 = 1;
|
||||
particle->effectId = this->id;
|
||||
particle->columnIndex = segment;
|
||||
particle->rowIndex = ring;
|
||||
particle->groupIndex = 1;
|
||||
particle->SetTexture(texture);
|
||||
particle->alpha = alpha;
|
||||
particle->unknown_0050 = 360;
|
||||
particle->angleParameter = 360;
|
||||
particle->scale = 4.1f;
|
||||
particle->unknown_004C = 80;
|
||||
particle->unknown_0054 = 0.0f;
|
||||
*reinterpret_cast<float*>(&particle->unknown_00C4) = static_cast<float>((particle->unknown_0010 + 2) * 90 % 360);
|
||||
particle->phaseParameter = 80;
|
||||
particle->animationParameter = 0.0f;
|
||||
*reinterpret_cast<float*>(&particle->angleBits) = static_cast<float>((particle->rowIndex + 2) * 90 % 360);
|
||||
|
||||
switch (this->id) {
|
||||
case EF_COUPLECASTING:
|
||||
particle->alpha += (3 - particle->unknown_0010) * 45;
|
||||
particle->unknown_00C0 = 20.0f - static_cast<float>(particle->unknown_0010);
|
||||
particle->alpha += (3 - particle->rowIndex) * 45;
|
||||
particle->speedParameter = 20.0f - static_cast<float>(particle->rowIndex);
|
||||
break;
|
||||
case EF_AURABLADE:
|
||||
particle->alpha = 0;
|
||||
particle->unknown_00E8 = -5 * particle->unknown_0010;
|
||||
particle->unknown_00C0 = 15.0f - static_cast<float>(particle->unknown_0010);
|
||||
particle->elapsedFrames = -5 * particle->rowIndex;
|
||||
particle->speedParameter = 15.0f - static_cast<float>(particle->rowIndex);
|
||||
break;
|
||||
case EF_BEGINSPELL:
|
||||
case EF_BEGINSPELL6:
|
||||
|
|
@ -50,8 +50,8 @@ void CSaintCastingEffect::AddRing(const char* texture, int alpha) {
|
|||
case EF_DARKCASTING2:
|
||||
case EF_GREENCASTING:
|
||||
particle->alpha = 0;
|
||||
particle->unknown_00E8 = -5 * particle->unknown_0010;
|
||||
particle->unknown_00C0 = 20.0f - static_cast<float>(particle->unknown_0010);
|
||||
particle->elapsedFrames = -5 * particle->rowIndex;
|
||||
particle->speedParameter = 20.0f - static_cast<float>(particle->rowIndex);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -142,17 +142,17 @@ void CSaintCastingEffect::Open() {
|
|||
switch (this->id) {
|
||||
case EF_BEGINSPELL:
|
||||
case EF_BEGINSPELL6:
|
||||
this->unknown_002C = 56;
|
||||
this->effectLifetime = 56;
|
||||
break;
|
||||
case EF_COUPLECASTING:
|
||||
this->unknown_002C = 1000;
|
||||
this->effectLifetime = 1000;
|
||||
break;
|
||||
case EF_AURABLADE:
|
||||
case EF_DARKCASTING:
|
||||
case EF_HOMUNCASTING:
|
||||
case EF_DARKCASTING2:
|
||||
case EF_GREENCASTING:
|
||||
this->unknown_002C = 60;
|
||||
this->effectLifetime = 60;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -172,8 +172,8 @@ void CSaintCastingEffect::OnProcess() {
|
|||
particle->position.y = this->position[1];
|
||||
particle->position.z = this->position[2];
|
||||
|
||||
if (particle && particle->unknown_00E8 > 0) {
|
||||
const int previousTilt = particle->unknown_004C - 1;
|
||||
if (particle && particle->elapsedFrames > 0) {
|
||||
const int previousTilt = particle->phaseParameter - 1;
|
||||
float scale = particle->scale + 0.07f;
|
||||
int tilt = previousTilt < 10 ? 10 : previousTilt;
|
||||
int alpha = previousTilt >= 10 ? particle->alpha : 0;
|
||||
|
|
@ -184,7 +184,7 @@ void CSaintCastingEffect::OnProcess() {
|
|||
alpha -= 3;
|
||||
if (alpha <= 0) {
|
||||
alpha = 0;
|
||||
if (particle->unknown_00E8 < this->unknown_002C - 30) {
|
||||
if (particle->elapsedFrames < this->effectLifetime - 30) {
|
||||
tilt = this->id == EF_AURABLADE ? 64 : 74;
|
||||
scale = 3.37f;
|
||||
}
|
||||
|
|
@ -192,19 +192,19 @@ void CSaintCastingEffect::OnProcess() {
|
|||
}
|
||||
|
||||
particle->scale = scale;
|
||||
particle->unknown_004C = tilt;
|
||||
particle->phaseParameter = tilt;
|
||||
particle->alpha = alpha;
|
||||
|
||||
const int ring = particle->unknown_0010;
|
||||
const int wave = ring < 2 ? ring * 90 + particle->unknown_00E8 : (ring * 45 + particle->unknown_00E8) * 2;
|
||||
const int segment = particle->unknown_000C;
|
||||
const int ring = particle->rowIndex;
|
||||
const int wave = ring < 2 ? ring * 90 + particle->elapsedFrames : (ring * 45 + particle->elapsedFrames) * 2;
|
||||
const int segment = particle->columnIndex;
|
||||
const float radius =
|
||||
particle->unknown_00C0 * g_sinTable[segment * 9] * 0.3f * g_sinTable[wave % 360] + particle->unknown_00C0;
|
||||
particle->speedParameter * g_sinTable[segment * 9] * 0.3f * g_sinTable[wave % 360] + particle->speedParameter;
|
||||
const float height = radius * g_sinTable[tilt];
|
||||
const float spread = radius * g_cosTable[tilt];
|
||||
const int angle =
|
||||
static_cast<int>(static_cast<float>(static_cast<int>(static_cast<float>(particle->unknown_0050) / 20.0f) * segment) +
|
||||
*reinterpret_cast<const float*>(&particle->unknown_00C4)) %
|
||||
static_cast<int>(static_cast<float>(static_cast<int>(static_cast<float>(particle->angleParameter) / 20.0f) * segment) +
|
||||
*reinterpret_cast<const float*>(&particle->angleBits)) %
|
||||
360;
|
||||
const float cosine = g_cosTable[angle];
|
||||
const float sine = g_sinTable[angle];
|
||||
|
|
@ -232,7 +232,7 @@ void CSaintCastingEffect::OnProcess() {
|
|||
this->lastOuter = outer;
|
||||
}
|
||||
|
||||
++particle->unknown_00E8;
|
||||
++particle->elapsedFrames;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ void CSaintCastingEffect::OnProcess() {
|
|||
void CSaintCastingEffect::Render() {
|
||||
for (auto it = this->particles.begin(); it != this->particles.end(); ++it) {
|
||||
CParticle* particle = *it;
|
||||
if (!particle || particle->unknown_000C <= 0) {
|
||||
if (!particle || particle->columnIndex <= 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ void CSaintCastingEffect::Render() {
|
|||
particle->destinationBlend = 6;
|
||||
}
|
||||
|
||||
const int segment = particle->unknown_000C;
|
||||
const int segment = particle->columnIndex;
|
||||
ParticleQuad quad;
|
||||
quad.billboard = false;
|
||||
quad.unused = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue