From bc85a947e6d074129b0bcf29a2ca8db8e12d63db Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 16 Apr 2024 23:23:12 -0400 Subject: [PATCH] fix JPABaseField::calcVel and JPADrawExecBillBoard::exec --- include/JSystem/JGeometry.h | 1 - src/JSystem/JParticle/JPADrawVisitor.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index cbfd53a12..dfba4f38a 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -77,7 +77,6 @@ struct TVec3 : public Vec { TVec3() {} TVec3(f32 x, f32 y, f32 z) { set(x, y, z); } TVec3(const Vec& b) { set(b); } - TVec3(const TVec3& b) { set(b); } operator Vec*() { return (Vec*)&x; } operator const Vec*() const { return (Vec*)&x; } diff --git a/src/JSystem/JParticle/JPADrawVisitor.cpp b/src/JSystem/JParticle/JPADrawVisitor.cpp index 75dd51365..b5a8b9548 100644 --- a/src/JSystem/JParticle/JPADrawVisitor.cpp +++ b/src/JSystem/JParticle/JPADrawVisitor.cpp @@ -289,7 +289,8 @@ void JPADrawExecBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl scaleX *= (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX); scaleY *= (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY); - JGeometry::TVec3 pt(ptcl->mPosition); + JGeometry::TVec3 pt; + pt.set(ptcl->mPosition); MTXMultVec(JPADrawContext::pcb->mDrawMtxPtr, pt, &pt); GXBegin(GX_QUADS, GX_VTXFMT0, 4);