X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSActionButton.m;h=58503c82de69560f91c3d30f1b438d4d6c148a7a;hp=98a186a8b49d30d68eb6c3f0bd9e0697eeb1d1a5;hb=dd1f684886c2809133356bb9b335a35293e8849e;hpb=530009447c5bbd360ac5023979cffc6d32a28df3

diff --git a/JSActionButton.m b/JSActionButton.m
index 98a186a..58503c8 100644
--- a/JSActionButton.m
+++ b/JSActionButton.m
@@ -5,27 +5,33 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
-@implementation JSActionButton
+#import "JSActionButton.h"
 
-@synthesize max, active;
+@implementation JSActionButton {
+    BOOL active;
+}
+
+@synthesize max;
+@synthesize active;
 
--(id)initWithIndex: (int)newIndex andName: (NSString *)newName {
-	if(self= [ super init]) {
-		subActions = NULL;
-		index = newIndex;
-		name = [[NSString alloc] initWithFormat: @"Button %d %@", (index+1), newName];
-	}
-	return self;
+- (id)initWithName:(NSString *)name_ idx:(int)idx max:(int)max_ {
+    if ((self = [super init])) {
+        self.index = idx;
+        self.max = max_;
+        if (name_.length)
+            self.name = [NSString stringWithFormat:@"Button %d - %@", self.index, name_];
+        else
+            self.name = [NSString stringWithFormat:@"Button %d", self.index];
+    }
+    return self;
 }
 
--(id) findSubActionForValue: (IOHIDValueRef) val {
-	if(IOHIDValueGetIntegerValue(val) == max)
-		return self;
-	return NULL;
+- (id)findSubActionForValue:(IOHIDValueRef)val {
+    return (IOHIDValueGetIntegerValue(val) == max) ? self : nil;
 }
 
--(void) notifyEvent: (IOHIDValueRef) value {
-	active = IOHIDValueGetIntegerValue(value) == max;
+- (void)notifyEvent:(IOHIDValueRef)value {
+    active = IOHIDValueGetIntegerValue(value) == max;
 }
 
 @end