X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSAction.h;h=dc00a8d8749eca6f84c6c3f30ebc5a50b21936f1;hp=551eb0ffe7c4774245f4849dde28cf75ecfd032a;hb=f563321aec9e13b8479ab3b890a9179f095a8b17;hpb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa

diff --git a/JSAction.h b/JSAction.h
index 551eb0f..dc00a8d 100644
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,17 +6,19 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-@interface JSAction : NSObject
+#import "NJActionPathElement.h"
 
-@property (assign) IOHIDElementCookie cookie;
-@property (copy) NSArray *children;
-@property (weak) id base;
-@property (copy) NSString *name;
-@property (assign) BOOL active;
-@property (readonly) float magnitude;
+@interface JSAction : NSObject <NJActionPathElement>
+
+@property (nonatomic, assign) IOHIDElementCookie cookie;
+@property (nonatomic, copy) NSArray *children;
+@property (nonatomic, weak) id base;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, assign) BOOL active;
+@property (nonatomic, readonly) float magnitude;
 @property (readonly) NSString *uid;
 
-- (id)initWithName:(NSString *)newName base:(JSAction *)newBase;
+- (id)initWithName:(NSString *)newName base:(id <NJActionPathElement>)newBase;
 
 - (void)notifyEvent:(IOHIDValueRef)value;
 - (id)findSubActionForValue:(IOHIDValueRef)value;