From ec0822b8f00cd09591c5deafa78a382131186859 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Fri, 9 Dec 2011 23:06:12 +0000 Subject: Moving things around in the Memory manager for Mac OS X. Fixed a bug in the OS X memory manager that would prevent the change in memory card to be reflected in the window. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@73112 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/PcsxrMemoryObject.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'macosx/PcsxrMemoryObject.h') 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 #import +#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; -- cgit v1.2.3