summaryrefslogtreecommitdiff
path: root/macosx/PcsxrMemoryObject.h
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-06-25 21:02:27 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-06-25 21:02:27 +0000
commit6c9a81db199b7c6f86cc28d14255ab81d25a0f58 (patch)
tree971dd7f0d2e61bc8d56541c0110f2348340fb6d1 /macosx/PcsxrMemoryObject.h
parent1e070eefdd97247bffec46c5553e435e2bcc9972 (diff)
downloadpcsxr-6c9a81db199b7c6f86cc28d14255ab81d25a0f58.tar.gz
Add animated memory card icons on OS X
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85554 e17a0e51-4ae3-4d35-97c3-1a29b211df97
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;