X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMapping.m;h=bcd2a8d405680a4c66c4ad8046b7681d5e0df23e;hp=04f6e68d7c6fa9bc0d383b58b8ea787434e87fb3;hb=281e575060f936fd9483d1cf6416851b3783fe42;hpb=b14d8429658dd6f3f7b4904301031addb502b22c

diff --git a/Classes/NJMapping.m b/Classes/NJMapping.m
index 04f6e68..bcd2a8d 100644
--- a/Classes/NJMapping.m
+++ b/Classes/NJMapping.m
@@ -33,15 +33,13 @@
     return self;
 }
 
-- (id)initWithSerialization:(NSDictionary *)serialization
-                   mappings:(id <NSFastEnumeration>)mappings {
+- (id)initWithSerialization:(NSDictionary *)serialization {
     if ((self = [self initWithName:serialization[@"name"]])) {
         NSDictionary *entries = serialization[@"entries"];
         if ([entries isKindOfClass:NSDictionary.class]) {
             for (id key in entries) {
                 if ([key isKindOfClass:NSString.class]) {
-                    NJOutput *output = [NJOutput outputDeserialize:entries[key]
-                                                      withMappings:mappings];
+                    NJOutput *output = [NJOutput outputWithSerialization:entries[key]];
                     if (output)
                         _entries[key] = output;
                 }
@@ -100,7 +98,7 @@
     return NO;
 }
 
-+ (id)mappingWithContentsOfURL:(NSURL *)url mappings:(id <NSFastEnumeration>)mappings error:(NSError **)error {
++ (id)mappingWithContentsOfURL:(NSURL *)url error:(NSError **)error {
     NSInputStream *stream = [NSInputStream inputStreamWithURL:url];
     [stream open];
     NSDictionary *serialization = stream && !*error
@@ -121,8 +119,7 @@
         return nil;
     }
     
-    return [[NJMapping alloc] initWithSerialization:serialization
-                                           mappings:mappings];
+    return [[NJMapping alloc] initWithSerialization:serialization];
 }
 
 - (void)mergeEntriesFrom:(NJMapping *)other {
@@ -130,4 +127,10 @@
         [_entries addEntriesFromDictionary:other->_entries];
 }
 
+- (void)postLoadProcess:(id <NSFastEnumeration>)allMappings {
+    for (NJOutput *o in _entries.allValues)
+        [o postLoadProcess:allMappings];
+}
+
+
 @end