Indices are for display niceness only, so index them from 1 rather than keep offsetti...

[enjoyable.git] / JSAction.m

diff --git a/JSAction.m b/JSAction.m
index 6bc1529..f96c10d 100644 (file)
--- a/JSAction.m
+++ b/JSAction.m
@@ -11,25 +11,36 @@
 
 @synthesize cookie;
 @synthesize index;
-@synthesize subActions;
+@synthesize children;
 @synthesize base;
 @synthesize name;
+@synthesize active;
+
+- (id)initWithName:(NSString *)newName base:(JSAction *)newBase {
+    if ((self = [super init])) {
+        self.name = newName;
+        self.base = newBase;
+    }
+    return self;
+}
 
 - (id)findSubActionForValue:(IOHIDValueRef)value {
     return NULL;
 }
 
 - (NSString *)stringify {
-    return [NSString stringWithFormat: @"%@~%p", [base stringify], cookie];
+    if (cookie)
+        return [NSString stringWithFormat: @"%@~%p", [base stringify], cookie];
+    else
+        return [NSString stringWithFormat: @"%@~%@", [base stringify], name];
 }
 
 - (void)notifyEvent:(IOHIDValueRef)value {
     [self doesNotRecognizeSelector:_cmd];
 }
 
-- (BOOL)active {
-    [self doesNotRecognizeSelector:_cmd];
-    return NO;
+- (float)magnitude {
+    return 0.f;
 }
 
 @end