project_files/HedgewarsMobile/Classes/TeamConfigViewController.m
author sheepluva
Wed, 29 Dec 2010 14:59:56 +0100
changeset 4774 d81c6e14416d
parent 4538 4c2dc9d75742
child 4811 3edc0cdcfe03
permissions -rw-r--r--
fix parachute wall climbing bug
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3829
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     1
/*
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     2
 * Hedgewars-iOS, a Hedgewars port for iOS devices
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     3
 * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     4
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     8
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    12
 * GNU General Public License for more details.
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    13
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    14
 * You should have received a copy of the GNU General Public License
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    15
 * along with this program; if not, write to the Free Software
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    17
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    18
 * File created on 20/04/2010.
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    19
 */
81db3c85784b headers ftw, also right project file
koda
parents: 3814
diff changeset
    20
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    21
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    22
#import "TeamConfigViewController.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    23
#import "CommodityFunctions.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    24
#import "SquareButtonView.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    25
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    26
@implementation TeamConfigViewController
3739
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
    27
@synthesize listOfTeams, listOfSelectedTeams, cachedContentsOfDir;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    28
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    29
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    30
#pragma mark View lifecycle
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    31
-(void) viewDidLoad {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    32
    [super viewDidLoad];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
    33
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    34
    CGSize screenSize = [[UIScreen mainScreen] bounds].size;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    35
    self.view.frame = CGRectMake(0, 0, screenSize.height, screenSize.width - 44);
4082
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 3983
diff changeset
    36
4244
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    37
    if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) {
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    38
        if (IS_IPAD())
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    39
            [self.tableView setBackgroundView:nil];
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    40
        else {
4356
d1d26f8963a3 update some files for new graphics and new ios4.2
koda
parents: 4284
diff changeset
    41
            UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"background~iphone.png"];
4244
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    42
            UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage];
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    43
            [backgroundImage release];
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    44
            [self.tableView setBackgroundView:background];
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    45
            [background release];
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    46
        }
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    47
    } else
4244
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    48
        self.view.backgroundColor = [UIColor blackColor];
bf46b4bdf27d iphone interface
koda
parents: 4115
diff changeset
    49
3917
4c243b1eac97 playing a bit with colors
koda
parents: 3829
diff changeset
    50
    self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
3703
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
    51
    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    52
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    53
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    54
-(void) viewWillAppear:(BOOL)animated {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    55
    [super viewWillAppear:animated];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    56
3739
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
    57
    NSArray *contentsOfDir = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:TEAMS_DIRECTORY() error:NULL];
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    58
    // avoid overwriting selected teams when returning on this view
3971
5c82ee165ed5 minor stuff
koda
parents: 3917
diff changeset
    59
    if ([self.cachedContentsOfDir isEqualToArray:contentsOfDir] == NO) {
3917
4c243b1eac97 playing a bit with colors
koda
parents: 3829
diff changeset
    60
        NSArray *colors = getAvailableColors();
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    61
        NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:[contentsOfDir count]];
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    62
        for (int i = 0; i < [contentsOfDir count]; i++) {
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    63
            NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    64
                                         [contentsOfDir objectAtIndex:i],@"team",
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    65
                                         [NSNumber numberWithInt:4],@"number",
3917
4c243b1eac97 playing a bit with colors
koda
parents: 3829
diff changeset
    66
                                         [colors objectAtIndex:i%[colors count]],@"color",nil];
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    67
            [array addObject:dict];
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    68
            [dict release];
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    69
        }
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    70
        self.listOfTeams = array;
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    71
        [array release];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
    72
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    73
        NSMutableArray *emptyArray = [[NSMutableArray alloc] initWithObjects:nil];
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    74
        self.listOfSelectedTeams = emptyArray;
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    75
        [emptyArray release];
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    76
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    77
        selectedTeamsCount = [self.listOfSelectedTeams count];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    78
        allTeamsCount = [self.listOfTeams count];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    79
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    80
        self.cachedContentsOfDir = [[NSArray alloc] initWithArray:contentsOfDir copyItems:YES];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    81
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    82
    [self.tableView reloadData];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    83
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    84
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    85
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    86
    return rotationManager(interfaceOrientation);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    87
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    88
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    89
-(NSInteger) filterNumberOfHogs:(NSInteger) hogs {
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    90
    NSInteger numberOfHogs;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    91
    if (hogs <= HW_getMaxNumberOfHogs() && hogs >= 1)
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    92
        numberOfHogs = hogs;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    93
    else {
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    94
        if (hogs > HW_getMaxNumberOfHogs())
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    95
            numberOfHogs = 1;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    96
        else
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    97
            numberOfHogs = HW_getMaxNumberOfHogs();
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    98
    }
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
    99
    return numberOfHogs;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   100
}
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   101
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   102
-(UIImage *)drawHogsRepeated:(NSInteger) manyTimes {
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   103
    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:HEDGEHOG_FILE()];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   104
    CGFloat screenScale = getScreenScale();
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   105
    int w = hogSprite.size.width * screenScale;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   106
    int h = hogSprite.size.height * screenScale;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   107
    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   108
    CGContextRef context = CGBitmapContextCreate(NULL, w * 3, h, 8, 4 * w * 3, colorSpace, kCGImageAlphaPremultipliedFirst);
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   109
    
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   110
    // draw the two images in the current context
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   111
    for (int i = 0; i < manyTimes; i++)
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   112
        CGContextDrawImage(context, CGRectMake(i*8*screenScale, 0, w, h), [hogSprite CGImage]);
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   113
    [hogSprite release];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   114
    
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   115
    // Create bitmap image info from pixel data in current context
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   116
    CGImageRef imageRef = CGBitmapContextCreateImage(context);
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   117
    
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   118
    // Create a new UIImage object
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   119
    UIImage *resultImage;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   120
    if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   121
        resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   122
    else
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   123
        resultImage = [UIImage imageWithCGImage:imageRef];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   124
    
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   125
    // Release colorspace, context and bitmap information
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   126
    CGColorSpaceRelease(colorSpace);
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   127
    CGContextRelease(context);
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   128
    CFRelease(imageRef);
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   129
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   130
    return resultImage;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   131
}
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   132
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   133
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   134
#pragma mark Table view data source
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   135
-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   136
    return 2;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   137
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   138
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   139
-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   140
    if (section == 0)
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   141
        return selectedTeamsCount;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   142
    else
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   143
        return allTeamsCount;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   144
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   145
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   146
// Customize the appearance of table view cells.
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   147
-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   148
    static NSString *CellIdentifier0 = @"Cell0";
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   149
    static NSString *CellIdentifier1 = @"Cell1";
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   150
    NSInteger section = [indexPath section];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   151
    UITableViewCell *cell;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   152
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   153
    if (section == 0) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   154
        cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   155
        if (cell == nil) {
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   156
            cell = [[[HoldTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier0] autorelease];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   157
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   158
            SquareButtonView *squareButton = [[SquareButtonView alloc] initWithFrame:CGRectMake(0, 0, 36, 36)];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   159
            cell.accessoryView = squareButton;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   160
            [squareButton release];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   161
        }
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   162
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   163
        NSMutableDictionary *selectedRow = [listOfSelectedTeams objectAtIndex:[indexPath row]];
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   164
        cell.textLabel.text = [[selectedRow objectForKey:@"team"] stringByDeletingPathExtension];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   165
        cell.textLabel.backgroundColor = [UIColor clearColor];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   166
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   167
        SquareButtonView *squareButton = (SquareButtonView *)cell.accessoryView;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   168
        [squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   169
        NSNumber *hogNumber = [selectedRow objectForKey:@"number"];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   170
        [squareButton setTitle:[hogNumber stringValue] forState:UIControlStateNormal];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   171
        squareButton.ownerDictionary = selectedRow;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   172
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   173
        cell.imageView.image = [self drawHogsRepeated:[hogNumber intValue]];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   174
        ((HoldTableViewCell *)cell).delegate = self;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   175
    } else {
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   176
        cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   177
        if (cell == nil)
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   178
            cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   179
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   180
        cell.textLabel.text = [[[listOfTeams objectAtIndex:[indexPath row]] objectForKey:@"team"] stringByDeletingPathExtension];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   181
        cell.textLabel.backgroundColor = [UIColor clearColor];
3814
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   182
        
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   183
        NSString *teamPath = [NSString stringWithFormat:@"%@/%@.plist",TEAMS_DIRECTORY(),cell.textLabel.text];
3814
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   184
        NSDictionary *firstHog = [[[NSDictionary dictionaryWithContentsOfFile:teamPath] objectForKey:@"hedgehogs"] objectAtIndex:0];
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   185
        if ([[firstHog objectForKey:@"level"] intValue] != 0) {
3814
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   186
            NSString *filePath = [NSString stringWithFormat:@"%@/cyborg.png",HATS_DIRECTORY()];
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   187
            UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath andCutAt:CGRectMake(0, 2, 32, 32)];
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   188
            UIImageView *spriteView = [[UIImageView alloc] initWithImage:sprite];
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   189
            [sprite release];
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   190
            
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   191
            cell.accessoryView = spriteView;
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   192
            [spriteView release];
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   193
        } else
7af568bc0710 discrimination between ai and humans
koda
parents: 3780
diff changeset
   194
            cell.accessoryView = nil;
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   195
    }
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   196
3917
4c243b1eac97 playing a bit with colors
koda
parents: 3829
diff changeset
   197
    cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   198
    cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   199
    cell.selectionStyle = UITableViewCellSelectionStyleNone;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   200
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   201
    return cell;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   202
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   203
3703
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   204
-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   205
    return 40.0;
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   206
}
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   207
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   208
-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
3983
aa24192417a8 use labels instead of images, should save ram and space
koda
parents: 3971
diff changeset
   209
    CGRect frame = CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30);
aa24192417a8 use labels instead of images, should save ram and space
koda
parents: 3971
diff changeset
   210
    NSString *text;
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   211
    if (section == 0)
3983
aa24192417a8 use labels instead of images, should save ram and space
koda
parents: 3971
diff changeset
   212
        text = NSLocalizedString(@"Playing Teams",@"");
3703
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   213
    else
3983
aa24192417a8 use labels instead of images, should save ram and space
koda
parents: 3971
diff changeset
   214
        text = NSLocalizedString(@"Available Teams",@"");
aa24192417a8 use labels instead of images, should save ram and space
koda
parents: 3971
diff changeset
   215
    UILabel *theLabel = createBlueLabel(text, frame);
3780
7c704e69242e fade in when returning from game, labels rewritten so that they are drawn at runtime (more flexibility with i18n and iphone support)
koda
parents: 3739
diff changeset
   216
    theLabel.center = CGPointMake(self.view.frame.size.width/2, 20);
3703
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   217
3780
7c704e69242e fade in when returning from game, labels rewritten so that they are drawn at runtime (more flexibility with i18n and iphone support)
koda
parents: 3739
diff changeset
   218
    UIView *theView = [[[UIView alloc] init] autorelease];
7c704e69242e fade in when returning from game, labels rewritten so that they are drawn at runtime (more flexibility with i18n and iphone support)
koda
parents: 3739
diff changeset
   219
    [theView addSubview:theLabel];
7c704e69242e fade in when returning from game, labels rewritten so that they are drawn at runtime (more flexibility with i18n and iphone support)
koda
parents: 3739
diff changeset
   220
    [theLabel release];
7c704e69242e fade in when returning from game, labels rewritten so that they are drawn at runtime (more flexibility with i18n and iphone support)
koda
parents: 3739
diff changeset
   221
    return theView;
3703
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   222
}
12d17c6e8855 halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up
koda
parents: 3697
diff changeset
   223
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   224
-(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
4538
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   225
    return IS_IPAD() ? 40 : 20;
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   226
}
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   227
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   228
-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger) section {
4538
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   229
    NSInteger height = IS_IPAD() ? 40 : 20;
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   230
    UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, height)];
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   231
    footer.backgroundColor = [UIColor clearColor];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   232
4538
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   233
    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width*80/100, height)];
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   234
    label.center = CGPointMake(self.tableView.frame.size.width/2, height/2);
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   235
    label.textAlignment = UITextAlignmentCenter;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   236
    label.font = [UIFont italicSystemFontOfSize:12];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   237
    label.textColor = [UIColor whiteColor];
4538
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   238
    label.numberOfLines = 2;
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   239
    if (section == 0)
4538
4c2dc9d75742 add more space for this help message on ipad
koda
parents: 4504
diff changeset
   240
        label.text = NSLocalizedString(@"Tap to add hogs or change color, touch and hold to remove a team.",@"");
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   241
    else
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   242
        label.text = NSLocalizedString(@"The robot badge indicates an AI-controlled team.",@"");
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   243
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   244
    label.backgroundColor = [UIColor clearColor];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   245
    [footer addSubview:label];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   246
    [label release];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   247
    return [footer autorelease];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   248
}
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   249
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   250
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   251
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   252
#pragma mark Table view delegate
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   253
-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   254
    NSInteger row = [indexPath row];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   255
    NSInteger section = [indexPath section];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   256
4486
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   257
    if (section == 1 && [self.listOfTeams count] > row) {
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   258
        [self.listOfSelectedTeams addObject:[self.listOfTeams objectAtIndex:row]];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3662
diff changeset
   259
        [self.listOfTeams removeObjectAtIndex:row];
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   260
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   261
        NSIndexPath *newIndexPath = [NSIndexPath indexPathForRow:selectedTeamsCount inSection:0];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   262
        allTeamsCount--;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   263
        selectedTeamsCount++;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   264
        [aTableView beginUpdates];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   265
        [aTableView insertRowsAtIndexPaths:[NSArray arrayWithObject:newIndexPath] withRowAnimation:UITableViewRowAnimationRight];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   266
        [aTableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationRight];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   267
        [aTableView endUpdates];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   268
    }
4486
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   269
    if (section == 0 && [self.listOfSelectedTeams count] > row) {
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   270
        NSMutableDictionary *selectedRow = [self.listOfSelectedTeams objectAtIndex:row];
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   271
        UITableViewCell *cell = [aTableView cellForRowAtIndexPath:indexPath];
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   272
        SquareButtonView *squareButton = (SquareButtonView *)cell.accessoryView;
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   273
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   274
        NSInteger increaseNumber = [[selectedRow objectForKey:@"number"] intValue] + 1;
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   275
        NSNumber *newNumber = [NSNumber numberWithInt:[self filterNumberOfHogs:increaseNumber]];
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   276
        [squareButton setTitle:[newNumber stringValue] forState:UIControlStateNormal];
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   277
        [selectedRow setObject:newNumber forKey:@"number"];
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   278
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   279
        cell.imageView.image = [self drawHogsRepeated:[newNumber intValue]];
2c8e4d859d37 fix crasher (somehow, might be glitchy)
koda
parents: 4476
diff changeset
   280
    }
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   281
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   282
4476
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   283
-(void) holdAction:(NSString *)content {
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   284
    NSInteger row;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   285
    for (row = 0; row < [self.listOfSelectedTeams count]; row++) {
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   286
        NSDictionary *dict = [self.listOfSelectedTeams objectAtIndex:row];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   287
        if ([content isEqualToString:[[dict objectForKey:@"team"] stringByDeletingPathExtension]])
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   288
            break;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   289
    }
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   290
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   291
    [self.listOfTeams addObject:[self.listOfSelectedTeams objectAtIndex:row]];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   292
    [self.listOfSelectedTeams removeObjectAtIndex:row];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   293
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   294
    [self.tableView beginUpdates];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   295
    [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationLeft];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   296
    [self.tableView insertRowsAtIndexPaths:[NSArray arrayWithObject:[NSIndexPath indexPathForRow:allTeamsCount inSection:1]] withRowAnimation:UITableViewRowAnimationLeft];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   297
    allTeamsCount++;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   298
    selectedTeamsCount--;
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   299
    [self.tableView endUpdates];
4bf74e158f44 team selection completely refactored, now has animation and more performance
koda
parents: 4356
diff changeset
   300
}
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   301
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   302
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   303
#pragma mark Memory management
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   304
-(void) didReceiveMemoryWarning {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   305
    // Relinquish ownership any cached data, images, etc that aren't in use.
3739
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
   306
    self.cachedContentsOfDir = nil;
3971
5c82ee165ed5 minor stuff
koda
parents: 3917
diff changeset
   307
    MSG_MEMCLEAN();
5c82ee165ed5 minor stuff
koda
parents: 3917
diff changeset
   308
    [super didReceiveMemoryWarning];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   309
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   310
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   311
-(void) viewDidUnload {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   312
    self.listOfTeams = nil;
3739
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
   313
    self.listOfSelectedTeams = nil;
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
   314
    self.cachedContentsOfDir = nil;
3662
a44406f4369b polish polish polish polish (also: panning horizontal fix, panning momentum, settings page reworked yet again, memory leaks, crashes, segfaults)
koda
parents: 3659
diff changeset
   315
    MSG_DIDUNLOAD();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   316
    [super viewDidUnload];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   317
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   318
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   319
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   320
-(void) dealloc {
3739
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
   321
    [listOfTeams release];
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
   322
    [listOfSelectedTeams release];
97cf933e5bd2 disable AI teleport
koda
parents: 3703
diff changeset
   323
    [cachedContentsOfDir release];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   324
    [super dealloc];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   325
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   326
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   327
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   328
@end
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   329