PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use final as variable name 

Former-commit-id: 95c00f709d
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-14 12:44:42 +03:00
parent ba6308823a
commit a0b77904ca
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Collision/COBBox.cpp
View File

@ -12,8 +12,8 @@ CAABox COBBox::CalculateAABox(const CTransform4f& xf) const { return CAABox(CVec
COBBox COBBox::FromAABox(const CAABox& box, const CTransform4f& xf) { COBBox COBBox::FromAABox(const CAABox& box, const CTransform4f& xf) {
CVector3f center = box.GetCenterPoint(); CVector3f center = box.GetCenterPoint();
CVector3f extents = box.GetMaxPoint() - center; CVector3f extents = box.GetMaxPoint() - center;
CTransform4f final = xf * CTransform4f::Translate(center); CTransform4f finalTransform = xf * CTransform4f::Translate(center);
return COBBox(final, extents); return COBBox(finalTransform, extents);
} }
bool COBBox::LineIntersectsBox(const CMRay& ray, float& penetration) const { return false; } bool COBBox::LineIntersectsBox(const CMRay& ray, float& penetration) const { return false; }

6
src/Dolphin/card/CARDBios.c
View File

@ -18,7 +18,7 @@ s32 __CARDClearStatus(s32 chan);
void __CARDSetDiskID(const DVDDiskID* id); void __CARDSetDiskID(const DVDDiskID* id);
static s32 Retry(s32 chan); static s32 Retry(s32 chan);
BOOL OnReset(BOOL final); BOOL OnReset(BOOL f);
static OSResetFunctionInfo ResetFunctionInfo = {OnReset, 127}; static OSResetFunctionInfo ResetFunctionInfo = {OnReset, 127};
void __CARDDefaultApiCallback(s32 chan, s32 result) {} void __CARDDefaultApiCallback(s32 chan, s32 result) {}
@ -545,8 +545,8 @@ s32 CARDFreeBlocks(s32 chan, s32* byteNotUsed, s32* filesNotUsed) {
return __CARDPutControlBlock(card, CARD_RESULT_READY); return __CARDPutControlBlock(card, CARD_RESULT_READY);
} }
static BOOL OnReset(BOOL final) { static BOOL OnReset(BOOL f) {
if (!final) { if (!f) {
if (CARDUnmount(0) == CARD_RESULT_BUSY || CARDUnmount(1) == CARD_RESULT_BUSY) { if (CARDUnmount(0) == CARD_RESULT_BUSY || CARDUnmount(1) == CARD_RESULT_BUSY) {
return FALSE; return FALSE;
} }

4
src/Dolphin/pad/pad.c
View File

@ -694,7 +694,7 @@ void PADSetAnalogMode(u32 mode) {
OSRestoreInterrupts(enabled); OSRestoreInterrupts(enabled);
} }
static BOOL OnReset(BOOL final) { static BOOL OnReset(BOOL f) {
static BOOL recalibrated = FALSE; static BOOL recalibrated = FALSE;
BOOL sync; BOOL sync;
@ -702,7 +702,7 @@ static BOOL OnReset(BOOL final) {
PADSetSamplingCallback(NULL); PADSetSamplingCallback(NULL);
} }
if (!final) { if (!f) {
sync = PADSync(); sync = PADSync();
if (!recalibrated && sync) { if (!recalibrated && sync) {
recalibrated = PADRecalibrate(PAD_CHAN0_BIT | PAD_CHAN1_BIT | PAD_CHAN2_BIT | PAD_CHAN3_BIT); recalibrated = PADRecalibrate(PAD_CHAN0_BIT | PAD_CHAN1_BIT | PAD_CHAN2_BIT | PAD_CHAN3_BIT);