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
|
|
@ -25,24 +25,24 @@ void CLightSphereEffect::CreateRayParticles(int param) {
|
|||
CParticle* particle = CreateParticle(reinterpret_cast<const vector3d*>(&this->position), 5);
|
||||
if (particle != nullptr) {
|
||||
particle->SetTexture("effect\\white02.bmp");
|
||||
particle->unknown_0004 = this->id;
|
||||
particle->unknown_000C = i;
|
||||
particle->unknown_0010 = c;
|
||||
particle->unknown_0008 = 1;
|
||||
particle->effectId = this->id;
|
||||
particle->columnIndex = i;
|
||||
particle->rowIndex = c;
|
||||
particle->groupIndex = 1;
|
||||
particle->alpha = 40;
|
||||
particle->scale = 1.0f;
|
||||
|
||||
int r1 = std::rand() % 360;
|
||||
particle->unknown_004C = r1 < 0 ? 0 : r1;
|
||||
particle->phaseParameter = r1 < 0 ? 0 : r1;
|
||||
|
||||
int r2 = std::rand() % 360;
|
||||
*reinterpret_cast<float*>(&particle->unknown_00C4) = static_cast<float>(r2 < 0 ? 0 : r2);
|
||||
*reinterpret_cast<float*>(&particle->angleBits) = static_cast<float>(r2 < 0 ? 0 : r2);
|
||||
|
||||
int r3 = std::rand() % 360;
|
||||
particle->unknown_0050 = r3 < 0 ? 0 : r3;
|
||||
particle->angleParameter = r3 < 0 ? 0 : r3;
|
||||
|
||||
particle->unknown_0054 = 10.0f;
|
||||
*reinterpret_cast<float*>(particle->unknown_0058) = static_cast<float>(param);
|
||||
particle->animationParameter = 10.0f;
|
||||
*reinterpret_cast<float*>(particle->animationParameters) = static_cast<float>(param);
|
||||
|
||||
switch (this->id) {
|
||||
case EF_LIGHTSPHERE_SUN: {
|
||||
|
|
@ -123,14 +123,14 @@ void CLightSphereEffect::Open() {
|
|||
CParticle* particle = CreateParticle(reinterpret_cast<const vector3d*>(&this->position), 5);
|
||||
if (particle != nullptr) {
|
||||
particle->SetTexture("effect\\thunder_center.bmp");
|
||||
particle->unknown_0004 = this->id;
|
||||
particle->unknown_000C = i;
|
||||
particle->unknown_0010 = 0;
|
||||
particle->unknown_0008 = 1;
|
||||
particle->effectId = this->id;
|
||||
particle->columnIndex = i;
|
||||
particle->rowIndex = 0;
|
||||
particle->groupIndex = 1;
|
||||
particle->scale = 3.5f;
|
||||
particle->alpha = 1;
|
||||
particle->unknown_0054 = -10.0f;
|
||||
*reinterpret_cast<float*>(particle->unknown_0058) = 0.0f;
|
||||
particle->animationParameter = -10.0f;
|
||||
*reinterpret_cast<float*>(particle->animationParameters) = 0.0f;
|
||||
|
||||
switch (this->id) {
|
||||
case EF_LIGHTSPHERE_SUN:
|
||||
|
|
@ -185,7 +185,7 @@ void CLightSphereEffect::OnProcess() {
|
|||
position.z = this->position[2];
|
||||
|
||||
if (particle != nullptr) {
|
||||
if (particle->unknown_00E8 < 300) {
|
||||
if (particle->elapsedFrames < 300) {
|
||||
const int alpha = particle->alpha + 1;
|
||||
particle->alpha = alpha >= 255 ? 255 : alpha;
|
||||
} else {
|
||||
|
|
@ -193,7 +193,7 @@ void CLightSphereEffect::OnProcess() {
|
|||
particle->alpha = alpha < 0 ? 0 : alpha;
|
||||
}
|
||||
|
||||
float& phase = *reinterpret_cast<float*>(particle->unknown_0058);
|
||||
float& phase = *reinterpret_cast<float*>(particle->animationParameters);
|
||||
const int spin = (static_cast<int>(phase) + 2) % 360;
|
||||
phase = static_cast<float>(spin);
|
||||
const float scale = particle->scale * g_sinTable[spin] * 0.05f + particle->scale;
|
||||
|
|
@ -211,14 +211,14 @@ void CLightSphereEffect::OnProcess() {
|
|||
|
||||
matrix translation;
|
||||
std::memcpy(translation.values, g_identityMatrix, sizeof(translation.values));
|
||||
translation.MakeTranslate(0.0f, particle->unknown_0054, 0.0f);
|
||||
translation.MakeTranslate(0.0f, particle->animationParameter, 0.0f);
|
||||
|
||||
matrix transform;
|
||||
transform.Compose(billboard, translation);
|
||||
particle->transform = transform;
|
||||
}
|
||||
|
||||
++particle->unknown_00E8;
|
||||
++particle->elapsedFrames;
|
||||
}
|
||||
|
||||
for (std::vector<CParticle*>::iterator it = this->rays.begin(); it != this->rays.end(); ++it) {
|
||||
|
|
@ -237,7 +237,7 @@ void CLightSphereEffect::OnProcess() {
|
|||
particle->scale = scale;
|
||||
|
||||
int alpha = particle->alpha;
|
||||
if (particle->unknown_00E8 > 500) {
|
||||
if (particle->elapsedFrames > 500) {
|
||||
--alpha;
|
||||
if (alpha < 0) {
|
||||
alpha = 0;
|
||||
|
|
@ -245,33 +245,33 @@ void CLightSphereEffect::OnProcess() {
|
|||
}
|
||||
particle->alpha = alpha;
|
||||
|
||||
const int previous = particle->unknown_0050;
|
||||
const int previous = particle->angleParameter;
|
||||
const int roll = std::rand() % 2;
|
||||
const int phase = (previous + 1 + (roll < 0 ? 0 : roll)) % 360;
|
||||
particle->unknown_0050 = phase;
|
||||
particle->angleParameter = phase;
|
||||
|
||||
vector3d points[3]{};
|
||||
const float radius = particle->scale * g_sinTable[phase] + particle->scale;
|
||||
const int pitch = particle->unknown_004C;
|
||||
const int yaw = static_cast<int>(*reinterpret_cast<float*>(&particle->unknown_00C4));
|
||||
const int pitch = particle->phaseParameter;
|
||||
const int yaw = static_cast<int>(*reinterpret_cast<float*>(&particle->angleBits));
|
||||
const float flat = radius * g_cosTable[pitch];
|
||||
points[0].x = flat * g_cosTable[yaw];
|
||||
points[0].y = radius * g_sinTable[pitch] - particle->unknown_0054;
|
||||
points[0].y = radius * g_sinTable[pitch] - particle->animationParameter;
|
||||
points[0].z = flat * g_sinTable[yaw];
|
||||
|
||||
if (*reinterpret_cast<float*>(particle->unknown_0058) == 0.0f) {
|
||||
if (*reinterpret_cast<float*>(particle->animationParameters) == 0.0f) {
|
||||
points[1].x = -0.5f;
|
||||
points[1].y = -particle->unknown_0054;
|
||||
points[1].y = -particle->animationParameter;
|
||||
points[1].z = 0.0f;
|
||||
points[2].x = 0.5f;
|
||||
points[2].y = -particle->unknown_0054;
|
||||
points[2].y = -particle->animationParameter;
|
||||
points[2].z = 0.0f;
|
||||
} else {
|
||||
points[1].x = 0.0f;
|
||||
points[1].y = -particle->unknown_0054;
|
||||
points[1].y = -particle->animationParameter;
|
||||
points[1].z = -0.5f;
|
||||
points[2].x = 0.0f;
|
||||
points[2].y = -particle->unknown_0054;
|
||||
points[2].y = -particle->animationParameter;
|
||||
points[2].z = 0.5f;
|
||||
}
|
||||
|
||||
|
|
@ -289,7 +289,7 @@ void CLightSphereEffect::OnProcess() {
|
|||
particle->vertices[3].z = points[2].z;
|
||||
}
|
||||
|
||||
++particle->unknown_00E8;
|
||||
++particle->elapsedFrames;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue