Rehauling the memory card object in preperation for fixing the memory card manager.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85872 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 18 insertions, 4 deletions

diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index 92ae447f..672bdec0 100755
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -13,21 +13,33 @@
 @class NSImage;
 @class NSString;
 @class NSArray;
+@class NSAttributedString;
 
 extern NSString *const memoryAnimateTimerKey;
 
+typedef enum _PCSXRMemFlags {
+	memFlagDeleted,
+	memFlagFree,
+	memFlagUsed,
+	memFlagLink,
+	memFlagEndLink
+} PCSXRMemFlags;
+
 @interface PcsxrMemoryObject : NSObject
 {
 	NSString *englishName;
 	NSString *sjisName;
 	NSString *memName;
 	NSString *memID;
-	NSInteger memImageIndex;
+	
 	NSArray *memImages;
-	BOOL notDeleted;
+	NSInteger memImageIndex;
+	
+	PCSXRMemFlags flagNameIndex;
 	unsigned char memFlags;
 }
 + (NSArray *)imagesFromMcd:(McdBlock *)block;
++ (NSString*)memoryLabelFromFlag:(PCSXRMemFlags)flagNameIndex;
 
 - (id)initWithMcdBlock:(McdBlock *)infoBlock;
 
@@ -35,9 +47,11 @@ extern NSString *const memoryAnimateTimerKey;
 @property (readonly, arcstrong) NSString *sjisName;
 @property (readonly, arcstrong) NSString *memName;
 @property (readonly, arcstrong) NSString *memID;
+@property (readonly, unsafe_unretained, nonatomic) NSString *flagName;
+@property (readonly, unsafe_unretained, nonatomic) NSAttributedString *attributedFlagName;
 @property (readonly, unsafe_unretained, nonatomic) NSImage *memImage;
-@property (readonly) int memIconCount;
-@property (readonly, getter = isNotDeleted) BOOL notDeleted;
+@property (readonly, nonatomic) int memIconCount;
+@property (readonly, getter = isNotDeleted, nonatomic) BOOL notDeleted DEPRECATED_ATTRIBUTE;
 @property (readonly) unsigned char memFlags;
 
 @end