X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSAction.m;h=1cdbeb23e4f0e5b32fe4052cbd25d3a9a3bb1353;hp=f96c10d878adc5dd7a9c6c2ddb73c385d36da911;hb=f563321aec9e13b8479ab3b890a9179f095a8b17;hpb=3f6df7a954fb74bcebf6fc6c0e60821843b0f31b

diff --git a/JSAction.m b/JSAction.m
index f96c10d..1cdbeb2 100644
--- a/JSAction.m
+++ b/JSAction.m
@@ -9,14 +9,7 @@
 
 @implementation JSAction
 
-@synthesize cookie;
-@synthesize index;
-@synthesize children;
-@synthesize base;
-@synthesize name;
-@synthesize active;
-
-- (id)initWithName:(NSString *)newName base:(JSAction *)newBase {
+- (id)initWithName:(NSString *)newName base:(id <NJActionPathElement>)newBase {
     if ((self = [super init])) {
         self.name = newName;
         self.base = newBase;
@@ -28,11 +21,8 @@
     return NULL;
 }
 
-- (NSString *)stringify {
-    if (cookie)
-        return [NSString stringWithFormat: @"%@~%p", [base stringify], cookie];
-    else
-        return [NSString stringWithFormat: @"%@~%@", [base stringify], name];
+- (NSString *)uid {
+    return [NSString stringWithFormat:@"%@~%@", [_base uid], _name];
 }
 
 - (void)notifyEvent:(IOHIDValueRef)value {