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
|
|
@ -797,18 +797,18 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
const RagEffectState& master = this->state.master->state;
|
||||
const int blend = pw != 0 ? 6 : 2;
|
||||
int red = r;
|
||||
if (master.unknown_11C88[0] != -1) {
|
||||
red = static_cast<unsigned char>(master.unknown_11C88[0]);
|
||||
if (master.colorChannels[0] != -1) {
|
||||
red = static_cast<unsigned char>(master.colorChannels[0]);
|
||||
}
|
||||
int green = g;
|
||||
if (master.unknown_11C88[1] != -1) {
|
||||
green = static_cast<unsigned char>(master.unknown_11C88[1]);
|
||||
if (master.colorChannels[1] != -1) {
|
||||
green = static_cast<unsigned char>(master.colorChannels[1]);
|
||||
}
|
||||
int blue = b;
|
||||
if (master.unknown_11C88[2] != -1) {
|
||||
blue = static_cast<unsigned char>(master.unknown_11C88[2]);
|
||||
if (master.colorChannels[2] != -1) {
|
||||
blue = static_cast<unsigned char>(master.colorChannels[2]);
|
||||
}
|
||||
int destBlend = master.unknown_11C88[3];
|
||||
int destBlend = master.colorChannels[3];
|
||||
if (destBlend == -1) {
|
||||
destBlend = blend;
|
||||
}
|
||||
|
|
@ -840,11 +840,11 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
RenderTriangle& triangle = this->state.triangles[*rpCnt];
|
||||
|
||||
if (pw == 10) {
|
||||
triangle.unknown_0064 = 2;
|
||||
triangle.unknown_0068 = 1;
|
||||
triangle.sourceBlend = 2;
|
||||
triangle.destinationBlend = 1;
|
||||
} else {
|
||||
triangle.unknown_0064 = 5;
|
||||
triangle.unknown_0068 = pw == 99 ? 6 : destBlend;
|
||||
triangle.sourceBlend = 5;
|
||||
triangle.destinationBlend = pw == 99 ? 6 : destBlend;
|
||||
}
|
||||
|
||||
RenderVertex first{};
|
||||
|
|
@ -885,7 +885,7 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
triangle.vertices[2].x = center.x - width;
|
||||
|
||||
for (int index = 0; index < 3; ++index) {
|
||||
triangle.vertices[index].y += static_cast<float>(-30 * g_renderer->viewport.height / 480) * this->render.unknown_005C;
|
||||
triangle.vertices[index].y += static_cast<float>(-30 * g_renderer->viewport.height / 480) * this->render.distanceScale;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -907,11 +907,11 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
RenderTriangle& triangle = this->state.triangles[*rpCnt];
|
||||
|
||||
if (pw == 10) {
|
||||
triangle.unknown_0064 = 2;
|
||||
triangle.unknown_0068 = 1;
|
||||
triangle.sourceBlend = 2;
|
||||
triangle.destinationBlend = 1;
|
||||
} else {
|
||||
triangle.unknown_0064 = 5;
|
||||
triangle.unknown_0068 = pw == 99 ? 6 : destBlend;
|
||||
triangle.sourceBlend = 5;
|
||||
triangle.destinationBlend = pw == 99 ? 6 : destBlend;
|
||||
}
|
||||
|
||||
RenderVertex first{};
|
||||
|
|
@ -952,7 +952,7 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
triangle.vertices[2].x = center.x + width;
|
||||
|
||||
for (int index = 0; index < 3; ++index) {
|
||||
triangle.vertices[index].y += static_cast<float>(-30 * g_renderer->viewport.height / 480) * this->render.unknown_005C;
|
||||
triangle.vertices[index].y += static_cast<float>(-30 * g_renderer->viewport.height / 480) * this->render.distanceScale;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1192,17 +1192,17 @@ void CEffectPrim::RenderTeiRect(
|
|||
}
|
||||
|
||||
const RagEffectState& master = this->state.master->state;
|
||||
if (master.unknown_11C88[3] != -1) {
|
||||
blend = master.unknown_11C88[3];
|
||||
if (master.colorChannels[3] != -1) {
|
||||
blend = master.colorChannels[3];
|
||||
}
|
||||
if (master.unknown_11C88[0] != -1) {
|
||||
red = master.unknown_11C88[0];
|
||||
if (master.colorChannels[0] != -1) {
|
||||
red = master.colorChannels[0];
|
||||
}
|
||||
if (master.unknown_11C88[1] != -1) {
|
||||
green = master.unknown_11C88[1];
|
||||
if (master.colorChannels[1] != -1) {
|
||||
green = master.colorChannels[1];
|
||||
}
|
||||
if (master.unknown_11C88[2] != -1) {
|
||||
blue = master.unknown_11C88[2];
|
||||
if (master.colorChannels[2] != -1) {
|
||||
blue = master.colorChannels[2];
|
||||
}
|
||||
const std::uint32_t color = static_cast<std::uint32_t>(((((alpha << 8) + red) << 8) + green) << 8) + blue;
|
||||
|
||||
|
|
@ -1245,8 +1245,8 @@ void CEffectPrim::RenderTeiRect(
|
|||
|
||||
for (int half = 0; half < 2; ++half) {
|
||||
RenderTriangle& triangle = this->state.triangles[*rpCnt];
|
||||
triangle.unknown_0064 = 5;
|
||||
triangle.unknown_0068 = blend;
|
||||
triangle.sourceBlend = 5;
|
||||
triangle.destinationBlend = blend;
|
||||
|
||||
for (int index = 0; index < 3; ++index) {
|
||||
RenderVertex& vertex = triangle.vertices[index];
|
||||
|
|
@ -1275,10 +1275,10 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
) {
|
||||
const RagEffectState& master = this->state.master->state;
|
||||
const int blend = pw != 0 ? 6 : 2;
|
||||
const int red = master.unknown_11C88[0] != -1 ? static_cast<unsigned char>(master.unknown_11C88[0]) : r;
|
||||
const int green = master.unknown_11C88[1] != -1 ? static_cast<unsigned char>(master.unknown_11C88[1]) : g;
|
||||
const int blue = master.unknown_11C88[2] != -1 ? static_cast<unsigned char>(master.unknown_11C88[2]) : b;
|
||||
const int destBlend = master.unknown_11C88[3] != -1 ? master.unknown_11C88[3] : blend;
|
||||
const int red = master.colorChannels[0] != -1 ? static_cast<unsigned char>(master.colorChannels[0]) : r;
|
||||
const int green = master.colorChannels[1] != -1 ? static_cast<unsigned char>(master.colorChannels[1]) : g;
|
||||
const int blue = master.colorChannels[2] != -1 ? static_cast<unsigned char>(master.colorChannels[2]) : b;
|
||||
const int destBlend = master.colorChannels[3] != -1 ? master.colorChannels[3] : blend;
|
||||
|
||||
if (*rpCnt >= 510) {
|
||||
return;
|
||||
|
|
@ -1307,8 +1307,8 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
vec4.z += position.z;
|
||||
|
||||
alignas(16) RenderVertex vertex;
|
||||
this->state.triangles[*rpCnt].unknown_0064 = 5;
|
||||
this->state.triangles[*rpCnt].unknown_0068 = destBlend;
|
||||
this->state.triangles[*rpCnt].sourceBlend = 5;
|
||||
this->state.triangles[*rpCnt].destinationBlend = destBlend;
|
||||
vertex = {0.0f, 0.0f, 0.0f, 0.0f, 0, 0xFF000000, 0.0f, 0.0f};
|
||||
g_renderer->viewport.Project(&vec1.x, wtm.values, vertex);
|
||||
this->state.triangles[*rpCnt].vertices[0] = vertex;
|
||||
|
|
@ -1336,8 +1336,8 @@ __declspec(safebuffers) void CEffectPrim::RenderTeiRect(
|
|||
++*rpCnt;
|
||||
}
|
||||
|
||||
this->state.triangles[*rpCnt].unknown_0064 = 5;
|
||||
this->state.triangles[*rpCnt].unknown_0068 = destBlend;
|
||||
this->state.triangles[*rpCnt].sourceBlend = 5;
|
||||
this->state.triangles[*rpCnt].destinationBlend = destBlend;
|
||||
vertex = {0.0f, 0.0f, 0.0f, 0.0f, 0, 0xFF000000, 0.0f, 0.0f};
|
||||
g_renderer->viewport.Project(&vec4.x, wtm.values, vertex);
|
||||
this->state.triangles[*rpCnt].vertices[0] = vertex;
|
||||
|
|
@ -5295,8 +5295,8 @@ void CEffectPrim::RenderRecordRings(matrix& wtm) {
|
|||
|
||||
for (int index = 0; index < this->state.numSegment; ++index) {
|
||||
const EffectPrimitiveRecord& record = this->state.records[index];
|
||||
const float inner = record.unknown_003C - this->state.size;
|
||||
const float outer = record.unknown_003C;
|
||||
const float inner = record.radius - this->state.size;
|
||||
const float outer = record.radius;
|
||||
|
||||
for (float i = 0.0f; last >= i; i += this->state.arcAngle) {
|
||||
const int angle1 = static_cast<int>(i);
|
||||
|
|
@ -5585,8 +5585,8 @@ void CEffectPrim::RenderPyramid(matrix& wtm) {
|
|||
if (triangle->Visible()) {
|
||||
RenderTriangle& submitted = *triangle++;
|
||||
if (this->state.slots[0].flag1[0] == 3) {
|
||||
submitted.unknown_0064 = 5;
|
||||
submitted.unknown_0068 = 2;
|
||||
submitted.sourceBlend = 5;
|
||||
submitted.destinationBlend = 2;
|
||||
g_renderer->queues.SubmitTriangle(submitted, 5, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd);
|
||||
} else {
|
||||
g_renderer->queues.SubmitTriangle(submitted, 1, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd);
|
||||
|
|
@ -6661,7 +6661,7 @@ void CEffectPrim::Render2DPrimitive() {
|
|||
|
||||
tri0.texture = this->state.textures[this->render.curMotion];
|
||||
|
||||
const std::uint16_t flag1 = (this->state.unknown_01C8[0] == 0) ? 1 : static_cast<std::uint16_t>(this->state.renderFlag);
|
||||
const std::uint16_t flag1 = (this->state.useRenderFlag[0] == 0) ? 1 : static_cast<std::uint16_t>(this->state.renderFlag);
|
||||
g_renderer->queues.SubmitTriangle(tri0, flag1, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd);
|
||||
|
||||
RenderTriangle& tri1 = this->state.triangles[1];
|
||||
|
|
@ -6691,13 +6691,13 @@ void CEffectPrim::Render2DPrimitive() {
|
|||
|
||||
tri1.texture = this->state.textures[this->render.curMotion];
|
||||
|
||||
const std::uint16_t flag2 = (this->state.unknown_01C8[0] == 0) ? 1 : static_cast<std::uint16_t>(this->state.renderFlag);
|
||||
const std::uint16_t flag2 = (this->state.useRenderFlag[0] == 0) ? 1 : static_cast<std::uint16_t>(this->state.renderFlag);
|
||||
g_renderer->queues.SubmitTriangle(tri1, flag2, g_renderer->commands, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd);
|
||||
|
||||
if (this->state.slots[0].life == 'b') {
|
||||
for (const ActiveSkillEffect& effect : g_activeSkillEffects) {
|
||||
if (effect.id == static_cast<std::uint32_t>(this->state.slots[0].rotStart)) {
|
||||
const std::uint32_t expire = effect.unknown_0004;
|
||||
const std::uint32_t expire = effect.expiration;
|
||||
bool match = false;
|
||||
if (timeGetTime() < expire && expire != 999999 && expire != 0) {
|
||||
match = true;
|
||||
|
|
@ -6753,7 +6753,7 @@ void CEffectPrim::RenderSegmentSprites2(matrix& wtm) {
|
|||
const SpriteRleImage* image = sprite->images[cell.imageType][cell.image];
|
||||
const double scale = record.scale;
|
||||
const float top = static_cast<float>(cell.y * scale * cell.scaleY * distanceScale + screenY);
|
||||
const float bottom = static_cast<float>(((static_cast<short>(image->unknown_0006) + 1) * image->height + cell.y) * scale * cell.scaleY * distanceScale + screenY);
|
||||
const float bottom = static_cast<float>(((static_cast<short>(image->doubleHeight) + 1) * image->height + cell.y) * scale * cell.scaleY * distanceScale + screenY);
|
||||
if (top >= static_cast<float>(g_renderer->viewport.height) || bottom <= 0.0f) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -6762,12 +6762,12 @@ void CEffectPrim::RenderSegmentSprites2(matrix& wtm) {
|
|||
float right;
|
||||
if ((cell.mirrored & 1) == 0) {
|
||||
left = static_cast<float>(cell.x * scale * cell.scaleX * distanceScale + screenX);
|
||||
right = static_cast<float>(((static_cast<short>(image->unknown_0004) + 1) * image->width + cell.x) * scale * cell.scaleX * distanceScale + screenX);
|
||||
right = static_cast<float>(((static_cast<short>(image->doubleWidth) + 1) * image->width + cell.x) * scale * cell.scaleX * distanceScale + screenX);
|
||||
if (left >= static_cast<float>(g_renderer->viewport.width)) {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
left = static_cast<float>(((static_cast<short>(image->unknown_0004) + 1) * image->width + cell.x) * scale * cell.scaleX * distanceScale + screenX);
|
||||
left = static_cast<float>(((static_cast<short>(image->doubleWidth) + 1) * image->width + cell.x) * scale * cell.scaleX * distanceScale + screenX);
|
||||
right = static_cast<float>(cell.x * scale * cell.scaleX * distanceScale + screenX);
|
||||
if (right >= static_cast<float>(g_renderer->viewport.width)) {
|
||||
continue;
|
||||
|
|
@ -6790,7 +6790,7 @@ void CEffectPrim::RenderSegmentSprites2(matrix& wtm) {
|
|||
} else {
|
||||
quad.color = (cell.color & 0xFF00FF00) | ((cell.color & 0xFF) << 16) | ((cell.color >> 16) & 0xFF);
|
||||
}
|
||||
quad.angle = static_cast<float>(cell.unknown_001C) + this->state.roll;
|
||||
quad.angle = static_cast<float>(cell.rotation) + this->state.roll;
|
||||
quad.image = image;
|
||||
this->DrawQuad(quad, sprite->palette, this->state.renderFlag, 0.0f, 0.0f, 0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue