diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-27 19:43:22 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-27 19:43:22 +0000 |
| commit | 92bae095d2a667b737a79ff104525a188537db52 (patch) | |
| tree | 2dd9b3a7065b1f1430605f2b16871cd3ed1c05a2 /macosx/PcsxrMemCardController.m | |
| parent | 66af39bcd108c546e7dba14e77e7d085de52f485 (diff) | |
| download | pcsxr-92bae095d2a667b737a79ff104525a188537db52.tar.gz | |
Added a note to the Mac OS X memory editor's source code.
Let's have the tab that opens in Mac preferences be the first tab. Somewhere this got changed.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72671 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrMemCardController.m')
| -rw-r--r-- | macosx/PcsxrMemCardController.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m index de918f74..0b594e71 100644 --- a/macosx/PcsxrMemCardController.m +++ b/macosx/PcsxrMemCardController.m @@ -12,6 +12,8 @@ #define MAX_MEMCARD_BLOCKS 15 +//FIXME: This code uses similar code to the GTK memory card manager, and both don't recognize saves that span multiple blocks. + static NSImage *imageFromMcd(short * icon) { NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0]; @@ -266,12 +268,11 @@ static inline void CopyMemcardData(char *from, char *to, int *i, char *str, int if (memCardSelect == 1) { CreateMcd(Config.Mcd1); LoadMcd(1, Config.Mcd1); - [self loadMemoryCardInfoForCard:1]; } else { CreateMcd(Config.Mcd2); LoadMcd(2, Config.Mcd2); - [self loadMemoryCardInfoForCard:2]; } + [self loadMemoryCardInfoForCard:memCardSelect]; } } @@ -336,11 +337,10 @@ static inline void CopyMemcardData(char *from, char *to, int *i, char *str, int if (memCardSelect == 1) { LoadMcd(1, Config.Mcd1); - [self loadMemoryCardInfoForCard:1]; } else { LoadMcd(2, Config.Mcd2); - [self loadMemoryCardInfoForCard:2]; } + [self loadMemoryCardInfoForCard:memCardSelect]; } } |