equal
deleted
inserted
replaced
99 #pragma mark View lifecycle |
99 #pragma mark View lifecycle |
100 - (void)viewDidLoad { |
100 - (void)viewDidLoad { |
101 [super viewDidLoad]; |
101 [super viewDidLoad]; |
102 |
102 |
103 // labels for the entries |
103 // labels for the entries |
104 NSMutableArray *array = [[NSMutableArray alloc] initWithObjects: |
104 NSArray *array = [[NSArray alloc] initWithObjects: |
105 NSLocalizedString(@"Grave",@""), |
105 NSLocalizedString(@"Grave",@""), |
106 NSLocalizedString(@"Voice",@""), |
106 NSLocalizedString(@"Voice",@""), |
107 NSLocalizedString(@"Fort",@""), |
107 NSLocalizedString(@"Fort",@""), |
108 NSLocalizedString(@"Flag",@""), |
108 NSLocalizedString(@"Flag",@""), |
109 NSLocalizedString(@"Level",@""),nil]; |
109 NSLocalizedString(@"Level",@""),nil]; |
166 [image release]; |
166 [image release]; |
167 |
167 |
168 UIImage *hatSprite = [[UIImage alloc] initWithCGImage:cgImgage]; |
168 UIImage *hatSprite = [[UIImage alloc] initWithCGImage:cgImgage]; |
169 CGImageRelease(cgImgage); |
169 CGImageRelease(cgImgage); |
170 |
170 |
171 [array addObject:mergeTwoImages(normalHogSprite, hatSprite)]; |
171 [array addObject:mergeHogHatSprites(normalHogSprite, hatSprite)]; |
172 [hatSprite release]; |
172 [hatSprite release]; |
173 } |
173 } |
174 [normalHogSprite release]; |
174 [normalHogSprite release]; |
175 self.hatArray = array; |
175 self.hatArray = array; |
176 [array release]; |
176 [array release]; |