diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-09-13 21:31:56 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-09-13 21:31:56 +0000 |
| commit | de50d760fd03a7eed9a614a3d4a701f2097c88d9 (patch) | |
| tree | abd27fe9c76372b7b819670dd15ec859de94e164 /macosx/PcsxrMemoryObject.m | |
| parent | 56d5b481986072f06ac516f43b68ec1d5b3aac1b (diff) | |
| download | pcsxr-de50d760fd03a7eed9a614a3d4a701f2097c88d9.tar.gz | |
Changing a few Objective C classes to have their ivars hidden.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87167 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrMemoryObject.m')
| -rwxr-xr-x | macosx/PcsxrMemoryObject.m | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index e87339c3..a54cc7a5 100755 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -57,8 +57,7 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate"; } [imagesArray addObject:memImage]; } - NSArray *retArray = [NSArray arrayWithArray:imagesArray]; - return retArray; + return [NSArray arrayWithArray:imagesArray]; } static NSString *MemLabelDeleted; @@ -120,11 +119,6 @@ static NSString *MemLabelEndLink; return imageBlank; } -- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(uint8_t)startIdx -{ - return [self initWithMcdBlock:infoBlock startingIndex:startIdx size:1]; -} - + (PCSXRMemFlags)memFlagsFromBlockFlags:(unsigned char)blockFlags { if ((blockFlags & 0xF0) == 0xA0) { @@ -165,13 +159,14 @@ static NSString *MemLabelEndLink; if ([englishName isEqualToString:sjisName]) { #if 0 if (![englishName isEqualToString:@""]) - NSLog(@"English name and sjis name are the same: %s. Replacing the sjis string with the English string.", [englishName UTF8String]); + NSLog(@"English name and sjis name are the same: %@. Replacing the sjis string with the English string.", englishName); #endif self.sjisName = self.englishName; } @autoreleasepool { self.memImages = [PcsxrMemoryObject imagesFromMcd:infoBlock]; } + if ([memImages count] == 0) { self.memImageIndex = -1; } else if ([memImages count] == 1) { |