diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2016-03-30 15:07:35 +0100 |
|---|---|---|
| committer | iCatButler <i.am.catbutler@gmail.com> | 2016-03-30 15:07:35 +0100 |
| commit | 8b4350fee747708ffd376744ef5dc1e239a87ba6 (patch) | |
| tree | a9ab6e2f25e06edc7c668353f8000856704f7fa3 /macosx/Source/PcsxrMemCardArray.m | |
| parent | e3df273095a5800e3dcdcb63bd66e269c0c2d3a8 (diff) | |
| download | pcsxr-8b4350fee747708ffd376744ef5dc1e239a87ba6.tar.gz | |
Bring up to date with PCSX-R master (97809)
Diffstat (limited to 'macosx/Source/PcsxrMemCardArray.m')
| -rw-r--r-- | macosx/Source/PcsxrMemCardArray.m | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/macosx/Source/PcsxrMemCardArray.m b/macosx/Source/PcsxrMemCardArray.m index b7429f20..cf01e15b 100644 --- a/macosx/Source/PcsxrMemCardArray.m +++ b/macosx/Source/PcsxrMemCardArray.m @@ -103,7 +103,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) McdBlock memBlock; GetMcdBlockInfo(carNum, i + 1, &memBlock); - if ([PcsxrMemoryObject memFlagsFromBlockFlags:memBlock.Flags] == memFlagFree) { + if ([PcsxrMemoryObject memFlagsFromBlockFlags:memBlock.Flags] == PCSXRMemFlagFree) { //Free space: ignore i++; continue; @@ -220,7 +220,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) { int memSize = MAX_MEMCARD_BLOCKS; for (PcsxrMemoryObject *memObj in rawArray) { - if (memObj.flag != memFlagDeleted) { + if (memObj.flag != PCSXRMemFlagDeleted) { memSize -= memObj.blockSize; } } @@ -272,9 +272,9 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) GetMcdBlockInfo(cardNumber, i+1, &baseBlock); PCSXRMemFlag theFlags = [PcsxrMemoryObject memFlagsFromBlockFlags:baseBlock.Flags]; - if (theFlags == memFlagDeleted || theFlags == memFlagFree) { + if (theFlags == PCSXRMemFlagDeleted || theFlags == PCSXRMemFlagFree) { PCSXRMemFlag up1Flags = theFlags; - while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS) { + while ((up1Flags == PCSXRMemFlagDeleted || up1Flags == PCSXRMemFlagFree) && x < MAX_MEMCARD_BLOCKS) { x++; McdBlock up1Block; GetMcdBlockInfo(cardNumber, x+1, &up1Block); @@ -300,7 +300,6 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) - (void)deleteMemoryBlocksAtIndex:(int)slotnum { - int xor = 0, i, j; char *data, *ptr, *filename; if (cardNumber == 1) { filename = Config.Mcd1; @@ -321,8 +320,9 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) McdBlock flagBlock; - for(i = theObj.startingIndex + 1; i < (theObj.startingIndex + theObj.blockSize + 1); i++) + for(int i = theObj.startingIndex + 1; i < (theObj.startingIndex + theObj.blockSize + 1); i++) { + char xor = 0; GetMcdBlockInfo(cardNumber, i, &flagBlock); ptr = data + i * 128; @@ -335,7 +335,7 @@ static inline void ClearMemcardData(char *to, int dsti, char *str) *ptr = 0xA0 | (flagBlock.Flags & 0xF); } else { continue; } - for (j = 0; j < 127; j++) xor ^= *ptr++; + for (unsigned char j = 0; j < 127; j++) xor ^= *ptr++; *ptr = xor; SaveMcd(filename, data, i * 128, 128); |