# HG changeset patch # User koda # Date 1283464864 -7200 # Node ID b333f3b79271fb9149bf37bdb0c9751b5a4cfe81 # Parent 8754f787439528791552fe60d2e4c4a21ec05fff# Parent 7b74aa003f52a53ec3be38c349e5dc7587bad4c3 merge diff -r 8754f7874395 -r b333f3b79271 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib --- a/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib Thu Sep 02 23:03:10 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib Fri Sep 03 00:01:04 2010 +0200 @@ -197,7 +197,7 @@ 292 - {{393, 399}, {240, 128}} + {{393, 389}, {240, 166}} NO NO @@ -207,7 +207,7 @@ 292 - {{403, 417}, {109, 22}} + {{401, 410}, {109, 22}} NO YES @@ -224,14 +224,14 @@ 292 - {{400, 427}, {232, 100}} + {{400, 429}, {232, 120}} NO YES 7 NO IBIPadFramework - Select which teams are playing! You can set the number of hogs and have multiple teams play together. + Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name. @@ -790,7 +790,7 @@ HelpPageViewController UIResponder UIControl - {{273, 67}, {1024, 768}} + {{273, 106}, {1024, 768}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff -r 8754f7874395 -r b333f3b79271 project_files/HedgewarsMobile/Classes/SingleTeamViewController.h --- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Thu Sep 02 23:03:10 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Fri Sep 03 00:01:04 2010 +0200 @@ -23,6 +23,7 @@ UIImage *normalHogSprite; NSArray *secondaryItems; + NSArray *moreSecondaryItems; BOOL isWriteNeeded; HogHatViewController *hogHatViewController; @@ -37,6 +38,7 @@ @property (nonatomic,retain) NSString *teamName; @property (nonatomic,retain) UIImage *normalHogSprite; @property (nonatomic,retain) NSArray *secondaryItems; +@property (nonatomic,retain) NSArray *moreSecondaryItems; -(void) writeFile; -(void) setWriteNeeded; diff -r 8754f7874395 -r b333f3b79271 project_files/HedgewarsMobile/Classes/SingleTeamViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Thu Sep 02 23:03:10 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Fri Sep 03 00:01:04 2010 +0200 @@ -19,7 +19,7 @@ #define TEAMNAME_TAG 78789 @implementation SingleTeamViewController -@synthesize teamDictionary, normalHogSprite, secondaryItems, teamName; +@synthesize teamDictionary, normalHogSprite, secondaryItems, moreSecondaryItems, teamName; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return rotationManager(interfaceOrientation); @@ -58,6 +58,16 @@ NSLocalizedString(@"Level",@""),nil]; self.secondaryItems = array; [array release]; + + // labels for the subtitles + NSArray *moreArray = [[NSArray alloc] initWithObjects: + NSLocalizedString(@"Mark the death of your fallen warriors",@""), + NSLocalizedString(@"Pick a slang your hogs will speak",@""), + NSLocalizedString(@"Select the team invincible fortress (only valid for fort games)",@""), + NSLocalizedString(@"Choose a charismatic symbol for your team",@""), + NSLocalizedString(@"Opt for controlling the team or let the AI lead",@""),nil]; + self.moreSecondaryItems = moreArray; + [moreArray release]; // load the base hog image, drawing will occure in cellForRow... NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()]; @@ -208,11 +218,12 @@ case 2: cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier2]; if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier2] autorelease]; } cell.textLabel.text = [self.secondaryItems objectAtIndex:row]; + cell.detailTextLabel.text = [self.moreSecondaryItems objectAtIndex:row]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; switch (row) { case 0: // grave @@ -222,17 +233,22 @@ cell.imageView.image = accessoryImage; [accessoryImage release]; break; + case 1: // voice + accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/HellishBomb.png", + GRAPHICS_DIRECTORY()]]; + cell.imageView.image = accessoryImage; + [accessoryImage release]; + break; case 2: // fort accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-preview.png", FORTS_DIRECTORY(),[teamDictionary objectForKey:@"fort"]]]; - cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(42, 42)]; + cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)]; [accessoryImage release]; break; - case 3: // flags accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png", FLAGS_DIRECTORY(),[teamDictionary objectForKey:@"flag"]]]; - cell.imageView.image = accessoryImage; + cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)]; [accessoryImage release]; break; case 4: // level @@ -240,7 +256,7 @@ BOTLEVELS_DIRECTORY(),[[[[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:0] objectForKey:@"level"] intValue]]]; - cell.imageView.image = accessoryImage; + cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)]; [accessoryImage release]; break; default: @@ -348,6 +364,7 @@ self.teamName = nil; self.normalHogSprite = nil; self.secondaryItems = nil; + self.moreSecondaryItems = nil; hogHatViewController = nil; gravesViewController = nil; voicesViewController = nil; @@ -363,6 +380,7 @@ [teamName release]; [normalHogSprite release]; [secondaryItems release]; + [moreSecondaryItems release]; [hogHatViewController release]; [gravesViewController release]; [fortsViewController release]; diff -r 8754f7874395 -r b333f3b79271 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Thu Sep 02 23:03:10 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Fri Sep 03 00:01:04 2010 +0200 @@ -99,13 +99,16 @@ [cell addSubview:numberButton]; [numberButton release]; - SquareButtonView *squareButton = [[SquareButtonView alloc] initWithFrame:CGRectMake(12+88+7, 5, 36, 36)]; + SquareButtonView *squareButton = [[SquareButtonView alloc] initWithFrame:CGRectMake(12+88+6, 5, 36, 36)]; squareButton.tag = SQUAREBUTTON_TAG; [cell addSubview:squareButton]; [squareButton release]; - UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(12+88+7+36+7, 10, 250, 25)]; + UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(12+88+6+36, 10, 103, 25)]; label.textAlignment = UITextAlignmentLeft; + label.minimumFontSize = 11; + label.adjustsFontSizeToFitWidth = YES; + label.baselineAdjustment = UIBaselineAdjustmentAlignCenters; label.backgroundColor = [UIColor clearColor]; label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]]; label.textColor = UICOLOR_HW_YELLOW_TEXT; @@ -126,12 +129,26 @@ SquareButtonView *squareButton = (SquareButtonView *)[cell viewWithTag:SQUAREBUTTON_TAG]; [squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]]; squareButton.ownerDictionary = selectedRow; + + NSString *teamPath = [NSString stringWithFormat:@"%@/%@",TEAMS_DIRECTORY(),[selectedRow objectForKey:@"team"]]; + NSDictionary *firstHog = [[[NSDictionary dictionaryWithContentsOfFile:teamPath] objectForKey:@"hedgehogs"] objectAtIndex:0]; + if ([[firstHog objectForKey:@"level"] intValue]> 0) { + NSString *filePath = [NSString stringWithFormat:@"%@/cyborg.png",HATS_DIRECTORY()]; + UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath andCutAt:CGRectMake(0, 2, 32, 32)]; + UIImageView *spriteView = [[UIImageView alloc] initWithImage:sprite]; + [sprite release]; + + cell.accessoryView = spriteView; + [spriteView release]; + } else + cell.accessoryView = nil; } else { cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1]; if (cell == nil) cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease]; cell.textLabel.text = [[[listOfTeams objectAtIndex:[indexPath row]] objectForKey:@"team"] stringByDeletingPathExtension]; + cell.accessoryView = nil; } if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { diff -r 8754f7874395 -r b333f3b79271 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Sep 02 23:03:10 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Sep 03 00:01:04 2010 +0200 @@ -2027,7 +2027,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#delete forbidden maps\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,Island}\nrm -rf ${PROJECT_DIR}/Data/Themes/City/Flake.png\n\n#the following ones must be removed when their support is implemented\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Russian,Singer,Surfer}\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/"; + shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{City,Island}\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#rm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Pirate,Robot,Russian,Singer,Surfer}\n\n#delete all names, missions, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Missions/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n"; showEnvVarsInLog = 0; }; 9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {