diff --git a/src/Collision/COBBox.cpp b/src/Collision/COBBox.cpp index 334ac7bc..1740c778 100644 --- a/src/Collision/COBBox.cpp +++ b/src/Collision/COBBox.cpp @@ -12,8 +12,8 @@ CAABox COBBox::CalculateAABox(const CTransform4f& xf) const { return CAABox(CVec COBBox COBBox::FromAABox(const CAABox& box, const CTransform4f& xf) { CVector3f center = box.GetCenterPoint(); CVector3f extents = box.GetMaxPoint() - center; - CTransform4f final = xf * CTransform4f::Translate(center); - return COBBox(final, extents); + CTransform4f finalTransform = xf * CTransform4f::Translate(center); + return COBBox(finalTransform, extents); } bool COBBox::LineIntersectsBox(const CMRay& ray, float& penetration) const { return false; } diff --git a/src/Dolphin/card/CARDBios.c b/src/Dolphin/card/CARDBios.c index 2fc984c0..6bf047e6 100644 --- a/src/Dolphin/card/CARDBios.c +++ b/src/Dolphin/card/CARDBios.c @@ -18,7 +18,7 @@ s32 __CARDClearStatus(s32 chan); void __CARDSetDiskID(const DVDDiskID* id); static s32 Retry(s32 chan); -BOOL OnReset(BOOL final); +BOOL OnReset(BOOL f); static OSResetFunctionInfo ResetFunctionInfo = {OnReset, 127}; void __CARDDefaultApiCallback(s32 chan, s32 result) {} @@ -545,8 +545,8 @@ s32 CARDFreeBlocks(s32 chan, s32* byteNotUsed, s32* filesNotUsed) { return __CARDPutControlBlock(card, CARD_RESULT_READY); } -static BOOL OnReset(BOOL final) { - if (!final) { +static BOOL OnReset(BOOL f) { + if (!f) { if (CARDUnmount(0) == CARD_RESULT_BUSY || CARDUnmount(1) == CARD_RESULT_BUSY) { return FALSE; } diff --git a/src/Dolphin/pad/pad.c b/src/Dolphin/pad/pad.c index 2a9b3f51..287dde18 100644 --- a/src/Dolphin/pad/pad.c +++ b/src/Dolphin/pad/pad.c @@ -694,7 +694,7 @@ void PADSetAnalogMode(u32 mode) { OSRestoreInterrupts(enabled); } -static BOOL OnReset(BOOL final) { +static BOOL OnReset(BOOL f) { static BOOL recalibrated = FALSE; BOOL sync; @@ -702,7 +702,7 @@ static BOOL OnReset(BOOL final) { PADSetSamplingCallback(NULL); } - if (!final) { + if (!f) { sync = PADSync(); if (!recalibrated && sync) { recalibrated = PADRecalibrate(PAD_CHAN0_BIT | PAD_CHAN1_BIT | PAD_CHAN2_BIT | PAD_CHAN3_BIT);