summaryrefslogtreecommitdiff
path: root/macosx/Source/PcsxrMemCardArray.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-11-16 21:05:39 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-11-16 21:05:39 +0000
commit759e29705c38cc58880dc892da2c28e8a84c2fac (patch)
treefe332d151b01fe7f85d756ca6cf6c9303be44e82 /macosx/Source/PcsxrMemCardArray.m
parenteded81ac8a46a6948a18bea53bb9388f519c052b (diff)
downloadpcsxr-759e29705c38cc58880dc892da2c28e8a84c2fac.tar.gz
OS X: Re-work PcsxrMemoryObject to make the properties more readable.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92297 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Source/PcsxrMemCardArray.m')
-rw-r--r--macosx/Source/PcsxrMemCardArray.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/Source/PcsxrMemCardArray.m b/macosx/Source/PcsxrMemCardArray.m
index dbea6bc7..ea739ffb 100644
--- a/macosx/Source/PcsxrMemCardArray.m
+++ b/macosx/Source/PcsxrMemCardArray.m
@@ -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.flagNameIndex != memFlagDeleted) {
+ if (memObj.flag != memFlagDeleted) {
memSize -= memObj.blockSize;
}
}
@@ -270,10 +270,10 @@ static inline void ClearMemcardData(char *to, int dsti, char *str)
x = i;
McdBlock baseBlock;
GetMcdBlockInfo(cardNumber, i+1, &baseBlock);
- PCSXRMemFlags theFlags = [PcsxrMemoryObject memFlagsFromBlockFlags:baseBlock.Flags];
+ PCSXRMemFlag theFlags = [PcsxrMemoryObject memFlagsFromBlockFlags:baseBlock.Flags];
if (theFlags == memFlagDeleted || theFlags == memFlagFree) {
- PCSXRMemFlags up1Flags = theFlags;
+ PCSXRMemFlag up1Flags = theFlags;
while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS) {
x++;
McdBlock up1Block;