1 files changed, 10 insertions, 2 deletions
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index 6f3bacb6..358acf87 100644
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -8,22 +8,30 @@
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSImage.h>
+#include "sio.h"
 
 @interface PcsxrMemoryObject : NSObject
 {
 	NSString *englishName;
 	NSString *sjisName;
+	NSString *memName;
+	NSString *memID;
 	NSImage *memImage;
+	int memIconCount;
 	BOOL notDeleted;
-	short memNumber;
 	unsigned char memFlags;
 }
++ (NSImage *)imageFromMcd:(short *)icon;
+
+- (id)initWithMcdBlock:(McdBlock *)infoBlock;
 
 @property(copy, readwrite) NSString *englishName;
 @property(copy, readwrite) NSString *sjisName;
+@property(copy, readwrite) NSString *memName;
+@property(copy, readwrite) NSString *memID;
 @property(retain, readwrite) NSImage *memImage;
+@property(readwrite) int memIconCount;
 @property(readwrite, getter = isNotDeleted) BOOL notDeleted;
-@property(readwrite) short memNumber;
 @property(readwrite) unsigned char memFlags;