diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-03 18:09:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-03 15:09:56 -0800 |
| commit | f97d334732201e5a8e1250318925c90d0c715225 (patch) | |
| tree | dffb749eaa0db03a031d854c319dc7e8f6d8e7b5 /src/JSystem/J2DGraph/J2DPane.cpp | |
| parent | 5716efc4c86f5e7e03263f0ed426c5e9ae834cd3 (diff) | |
Debug+retail matches and clean up some fakematches (#2910)
* Debug matches
* Match daAlink_c::procGrassWhistleWait
* Match JASAramStream::channelProc
* More debug matches
* Match JAUStreamStaticAramMgr_::deleteStreamAram and bitset inlines
* Fix some fakematches
* Fix gameinfo player info not being a struct
* Update bug comments
* Fix procids in alink
* d_a_scene_exit OK
Diffstat (limited to 'src/JSystem/J2DGraph/J2DPane.cpp')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DPane.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp index 6de4c1772f..231488bd77 100644 --- a/src/JSystem/J2DGraph/J2DPane.cpp +++ b/src/JSystem/J2DGraph/J2DPane.cpp @@ -343,7 +343,8 @@ void J2DPane::place(JGeometry::TBox2<f32> const& box) { f32 xOff = tmpBox.i.x - mBounds.i.x; f32 yOff = tmpBox.i.y - mBounds.i.y; - for (J2DPane* child = getFirstChildPane(); child != NULL; child = child->getNextChildPane()) { + J2DPane* child; + for (child = getFirstChildPane(); child != NULL; child = child->getNextChildPane()) { child->mTranslateX += xOff; child->mTranslateY += yOff; if (xOff != 0 || yOff != 0) { @@ -432,10 +433,9 @@ void J2DPane::rotate(f32 angle) { } void J2DPane::clip(JGeometry::TBox2<f32> const& bounds) { - JGeometry::TBox2<f32> boxA(bounds); - JGeometry::TBox2<f32> boxB(mGlobalBounds); - boxA.addPos(boxB.i); - mClipRect.intersect(boxA); + JGeometry::TBox2<f32> box(bounds); + box.addPos(JGeometry::TVec2<f32>(mGlobalBounds.i.x, mGlobalBounds.i.y)); + mClipRect.intersect(box); } J2DPane* J2DPane::search(u64 tag) { |