From f38b962a5844502889ec00a98d0c9ed2a1151695 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 17 Sep 2026 10:05:55 -0400 Subject: demo d_file_error OK, fmap/fmap2 work, misc (#1208) * d_file_error OK, use J2DPane inlines everywhere * d_menu_fmap demo work * fmap and fmap2 work * fix demo regression with ternary fakematch * inline cleanup, f_pc_profile OK for demo * fix min/max bss order * lstair almost for demo --- src/JSystem/J2DGraph/J2DPane.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/JSystem/J2DGraph') diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp index b8417d52..8403d6ef 100644 --- a/src/JSystem/J2DGraph/J2DPane.cpp +++ b/src/JSystem/J2DGraph/J2DPane.cpp @@ -53,7 +53,7 @@ void J2DPane::initiate() { mRotation = 0.0f; mCullMode = GX_CULL_NONE; mAlpha = 0xFF; - mInheritAlpha = TRUE; + mInfluencedAlpha = true; mDrawAlpha = 0xFF; mIsConnectParent = 0; calcMtx(); @@ -106,9 +106,9 @@ void J2DPane::makePaneStream(J2DPane* pParentPane, JSURandomInputStream* pStream size--; } - mInheritAlpha = TRUE; + mInfluencedAlpha = true; if (size != 0) { - mInheritAlpha = pStream->readU8() != 0; + mInfluencedAlpha = pStream->readU8() != 0; size--; } @@ -175,7 +175,7 @@ void J2DPane::draw(f32 x, f32 y, const J2DGrafContext* pCtx, bool clip) { } mDrawAlpha = mAlpha; - if (mInheritAlpha) + if (mInfluencedAlpha) mDrawAlpha = (mAlpha * pParentPane->mDrawAlpha) / 0xFF; } else { mGlobalBounds.addPos(x, y); -- cgit v1.2.3