diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-21 23:19:04 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-21 23:19:04 +0000 |
| commit | de13f7dcbaa84255fa578aafe862f90c46225a01 (patch) | |
| tree | 0da83fa6b6e634d1f3e4a7af7e629d5473cfd76e /macosx/PcsxrMemoryObject.m | |
| parent | e57165ae3f1706afec533d7b3cae17555a0f38ad (diff) | |
| download | pcsxr-de13f7dcbaa84255fa578aafe862f90c46225a01.tar.gz | |
Fix OS X 10.8-only behavior in the XGL plug-in.
Remove some commented-out code on Cocoa code.
Change some ints passed in Cocoa code to NSIntegers.
Replace a deprecated function call to NSRunAlertPanelRelativeToWindow.
Other minor fixes and improvements.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86808 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrMemoryObject.m')
| -rwxr-xr-x | macosx/PcsxrMemoryObject.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index b5414e38..675033b4 100755 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -22,8 +22,8 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate"; @property (readwrite, arcstrong) NSString *sjisName; @property (readwrite, arcstrong) NSString *memName; @property (readwrite, arcstrong) NSString *memID; -@property (readwrite) int startingIndex; -@property (readwrite) int blockSize; +@property (readwrite) uint8_t startingIndex; +@property (readwrite) uint8_t blockSize; @property (readwrite, nonatomic) NSInteger memImageIndex; @property (arcstrong) NSArray *memImages; @@ -124,7 +124,7 @@ static NSString *MemLabelEndLink; return imageBlank; } -- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(int)startIdx +- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(uint8_t)startIdx { return [self initWithMcdBlock:infoBlock startingIndex:startIdx size:1]; } @@ -151,7 +151,7 @@ static NSString *MemLabelEndLink; return memFlagFree; } -- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(int)startIdx size:(int)memSize +- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(uint8_t)startIdx size:(uint8_t)memSize { if (self = [super init]) { self.startingIndex = startIdx; |