X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Target.m;h=42d004c6cd94e2ca67f26eff49896e71d4e0f2db;hp=36da02126a8aff435624ffa0c4d3bb4726a5ab84;hb=f864d363128de19fc6591b77ae9226b34166d715;hpb=15a3aec049658f4a1c3c6e8c9f8a549fb8de0782 diff --git a/Target.m b/Target.m index 36da021..42d004c 100644 --- a/Target.m +++ b/Target.m @@ -28,20 +28,29 @@ return nil; } +- (BOOL)isEqual:(id)object { + return [object isKindOfClass:Target.class] + && [[self serialize] isEqual:[object serialize]]; +} + +- (NSUInteger)hash { + return [[self serialize] hash]; +} + + (Target *)targetDeserialize:(NSDictionary *)serialization withConfigs:(NSArray *)configs { // Don't crash loading old configs (but don't load them either). - if (![serialization isKindOfClass:[NSDictionary class]]) + if (![serialization isKindOfClass:NSDictionary.class]) return nil; NSString *type = serialization[@"type"]; - for (Class cls in @[[TargetKeyboard class], - [TargetConfig class], - [TargetMouseMove class], - [TargetMouseBtn class], - [TargetMouseScroll class], - [TargetToggleMouseScope class] + for (Class cls in @[TargetKeyboard.class, + TargetConfig.class, + TargetMouseMove.class, + TargetMouseBtn.class, + TargetMouseScroll.class, + TargetToggleMouseScope.class ]) { - if ([type isEqualToString:[cls serializationCode]]) + if ([type isEqualToString:cls.serializationCode]) return [cls targetDeserialize:serialization withConfigs:configs]; } @@ -54,7 +63,7 @@ - (void)untrigger { } -- (BOOL)update:(JoystickController *)jc { +- (BOOL)update:(NJInputController *)jc { return NO; }