From de13f7dcbaa84255fa578aafe862f90c46225a01 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Wed, 21 Aug 2013 23:19:04 +0000 Subject: 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 --- macosx/PcsxrMemoryObject.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'macosx/PcsxrMemoryObject.m') 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; -- cgit v1.2.3