summaryrefslogtreecommitdiff
path: root/macosx/PcsxrMemoryObject.h
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/PcsxrMemoryObject.h')
-rwxr-xr-xmacosx/PcsxrMemoryObject.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index 556d2acd..e197c21a 100755
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -11,6 +11,9 @@
@class NSImage;
@class NSString;
+@class NSArray;
+
+extern NSString *const memoryAnimateTimerKey;
@interface PcsxrMemoryObject : NSObject
{
@@ -19,11 +22,13 @@
NSString *memName;
NSString *memID;
NSImage *memImage;
+ NSArray *memImages;
int memIconCount;
BOOL notDeleted;
unsigned char memFlags;
}
-+ (NSImage *)imageFromMcd:(short *)icon;
++ (NSImage *)imageFromMcd:(McdBlock *)block index:(int)idx;
++ (NSArray *)imagesFromMcd:(McdBlock *)block;
- (id)initWithMcdBlock:(McdBlock *)infoBlock;
@@ -31,7 +36,7 @@
@property(readonly, retain) NSString *sjisName;
@property(readonly, retain) NSString *memName;
@property(readonly, retain) NSString *memID;
-@property(readonly, retain) NSImage *memImage;
+@property(readwrite, retain) NSImage *memImage;
@property(readonly) int memIconCount;
@property(readonly, getter = isNotDeleted) BOOL notDeleted;
@property(readonly) unsigned char memFlags;