X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSAction.h;h=5f61191b0b5f15a29361c00c6fc302e2cf888c0e;hp=30e99b9cd71e68a4a649a9d170589d7742a5f0ae;hb=44fe6f649589488b367eee7ffff240cecf8669ad;hpb=20ccd38576bb48caf8e4129a8c86fe04819d83bc

diff --git a/JSAction.h b/JSAction.h
index 30e99b9..5f61191 100644
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,23 +6,19 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <IOKit/hid/IOHIDBase.h>
+@interface JSAction : NSObject
 
-@interface JSAction : NSObject {
-	id base;
-	NSString *name;
-}
-
-@property (assign) void* cookie;
-@property (assign) int index;
+@property (assign) void *cookie;
 @property (copy) NSArray *children;
-@property (strong) id base;
+@property (weak) id base;
 @property (copy) NSString *name;
-@property (readonly) BOOL active;
+@property (assign) BOOL active;
+@property (readonly) float magnitude;
+@property (readonly) NSString *uid;
+
+- (id)initWithName:(NSString *)newName base:(JSAction *)newBase;
 
 - (void)notifyEvent:(IOHIDValueRef)value;
-- (NSString *)stringify;
 - (id)findSubActionForValue:(IOHIDValueRef)value;
 
 @end