diff -r 2c06b1120749 -r 00215a7ec5f5 project_files/HedgewarsMobile/Classes/WeaponCellView.m --- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m Fri Dec 29 22:37:31 2017 +0100 +++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m Sat Dec 30 01:22:11 2017 +0100 @@ -24,7 +24,7 @@ @synthesize delegate, weaponName, weaponIcon, initialSli, probabilitySli, delaySli, crateSli, helpLabel, initialImg, probabilityImg, delayImg, crateImg, initialLab, probabilityLab, delayLab, crateLab; --(id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { +- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) { delegate = nil; @@ -67,16 +67,12 @@ NSString *imgAmmoStr = [[NSString alloc] initWithFormat:@"%@/ammopic.png",ICONS_DIRECTORY()]; initialImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgAmmoStr]]; - [imgAmmoStr release]; NSString *imgDamageStr = [[NSString alloc] initWithFormat:@"%@/iconDamage.png",ICONS_DIRECTORY()]; probabilityImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgDamageStr]]; - [imgDamageStr release]; NSString *imgTimeStr = [[NSString alloc] initWithFormat:@"%@/iconTime.png",ICONS_DIRECTORY()]; delayImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgTimeStr]]; - [imgTimeStr release]; NSString *imgBoxStr = [[NSString alloc] initWithFormat:@"%@/iconBox.png",ICONS_DIRECTORY()]; crateImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgBoxStr]]; - [imgBoxStr release]; initialLab = [[UILabel alloc] init]; initialLab.backgroundColor = [UIColor clearColor]; @@ -128,7 +124,7 @@ return self; } --(void) layoutSubviews { +- (void)layoutSubviews { [super layoutSubviews]; CGFloat hOffset = 80; @@ -186,13 +182,13 @@ } /* --(void) setSelected:(BOOL)selected animated:(BOOL)animated { +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { [super setSelected:selected animated:animated]; // Configure the view for the selected state } */ --(void) valueChanged:(id) sender { +- (void)valueChanged:(id)sender { if (self.delegate != nil) { initialLab.text = ((int)initialSli.value == 9) ? @"∞" : [NSString stringWithFormat:@"%d",(int)initialSli.value]; probabilityLab.text = ((int)probabilitySli.value == 9) ? @"∞" : [NSString stringWithFormat:@"%d",(int)probabilitySli.value]; @@ -209,7 +205,7 @@ DLog(@"error - delegate = nil!"); } --(void) startDragging:(id) sender { +- (void)startDragging:(id)sender { UISlider *slider = (UISlider *)sender; NSString *str = nil; @@ -242,28 +238,8 @@ self.helpLabel.text = str; } --(void) stopDragging:(id) sender { +- (void)stopDragging:(id)sender { self.helpLabel.text = @""; } --(void) dealloc { - self.delegate = nil; - releaseAndNil(weaponName); - releaseAndNil(weaponIcon); - releaseAndNil(initialSli); - releaseAndNil(probabilitySli); - releaseAndNil(delaySli); - releaseAndNil(crateSli); - releaseAndNil(initialImg); - releaseAndNil(probabilityImg); - releaseAndNil(delayImg); - releaseAndNil(crateImg); - releaseAndNil(initialLab); - releaseAndNil(probabilityLab); - releaseAndNil(delayLab); - releaseAndNil(crateLab); - releaseAndNil(helpLabel); - [super dealloc]; -} - @end