hedgewars: comparison project_files/HedgewarsMobile/Classes/GameConfigViewController.m

equal deleted inserted replaced

-:0f6e3219c108
+:5c82ee165ed5
 theButton = (UIButton *)sender;
 switch (theButton.tag) {
 case 0:
 playSound(@"backSound");
-if ([mapConfigViewController busy]) {
+if ([self.mapConfigViewController busy]) {
 UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Wait for the Preview",@"")
 message:NSLocalizedString(@"Before returning the preview needs to be generated",@"")
 delegate:nil
 cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
 otherButtonTitles:nil];
 }
 }
 -(BOOL) isEverythingSet {
 // don't start playing if the preview is in progress
-if ([mapConfigViewController busy]) {
+if ([self.mapConfigViewController busy]) {
 UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Wait for the Preview",@"")
 message:NSLocalizedString(@"Before playing the preview needs to be generated",@"")
 delegate:nil
 cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
 otherButtonTitles:nil];
 [alert release];
 return NO;
 }
 // play only if there is more than one team
-if ([teamConfigViewController.listOfSelectedTeams count] < 2) {
+if ([self.teamConfigViewController.listOfSelectedTeams count] < 2) {
 UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too few teams playing",@"")
 message:NSLocalizedString(@"Select at least two teams to play a game",@"")
 delegate:nil
 cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
 otherButtonTitles:nil];
 // play if there's room for enough hogs in the selected map
 int hogs = 0;
 for (NSDictionary *teamData in teamConfigViewController.listOfSelectedTeams)
 hogs += [[teamData objectForKey:@"number"] intValue];
-if (hogs > mapConfigViewController.maxHogs) {
+if (hogs > self.mapConfigViewController.maxHogs) {
 UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too many hogs",@"")
 message:NSLocalizedString(@"The map is too small for that many hogs",@"")
 delegate:nil
 cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
 otherButtonTitles:nil];
 [alert show];
 [alert release];
 return NO;
 }
-if ([teamConfigViewController.listOfSelectedTeams count] > HW_getMaxNumberOfTeams()) {
+if ([self.teamConfigViewController.listOfSelectedTeams count] > HW_getMaxNumberOfTeams()) {
 UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too many teams",@"")
 message:NSLocalizedString(@"Max six teams are allowed in the same game",@"")
 delegate:nil
 cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
 otherButtonTitles:nil];
 [alert show];
 [alert release];
 return NO;
 }
-if ([schemeWeaponConfigViewController.selectedScheme length] == 0 || [schemeWeaponConfigViewController.selectedWeapon length] == 0 ) {
+if ([self.schemeWeaponConfigViewController.selectedScheme length] == 0 || [self.schemeWeaponConfigViewController.selectedWeapon length] == 0 ) {
 UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Missing detail",@"")
 message:NSLocalizedString(@"Select one Scheme and one Weapon for this game",@"")
 delegate:nil
 cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
 otherButtonTitles:nil];
 if ([self isEverythingSet] == NO)
 return;
 // create the configuration file that is going to be sent to engine
-NSDictionary *gameDictionary = [NSDictionary dictionaryWithObjectsAndKeys:mapConfigViewController.seedCommand,@"seed_command",
+NSDictionary *gameDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
-mapConfigViewController.templateFilterCommand,@"templatefilter_command",
+self.mapConfigViewController.seedCommand,@"seed_command",
-mapConfigViewController.mapGenCommand,@"mapgen_command",
+self.mapConfigViewController.templateFilterCommand,@"templatefilter_command",
-mapConfigViewController.mazeSizeCommand,@"mazesize_command",
+self.mapConfigViewController.mapGenCommand,@"mapgen_command",
-mapConfigViewController.themeCommand,@"theme_command",
+self.mapConfigViewController.mazeSizeCommand,@"mazesize_command",
-mapConfigViewController.staticMapCommand,@"staticmap_command",
+self.mapConfigViewController.themeCommand,@"theme_command",
-mapConfigViewController.missionCommand,@"mission_command",
+self.mapConfigViewController.staticMapCommand,@"staticmap_command",
-teamConfigViewController.listOfSelectedTeams,@"teams_list",
+self.mapConfigViewController.missionCommand,@"mission_command",
-schemeWeaponConfigViewController.selectedScheme,@"scheme",
+self.teamConfigViewController.listOfSelectedTeams,@"teams_list",
-schemeWeaponConfigViewController.selectedWeapon,@"weapon",
+self.schemeWeaponConfigViewController.selectedScheme,@"scheme",
-[NSNumber numberWithInt:self.interfaceOrientation],@"orientation",
+self.schemeWeaponConfigViewController.selectedWeapon,@"weapon",
-nil];
+[NSNumber numberWithInt:self.interfaceOrientation],@"orientation",
+nil];
 // finally launch game and remove this controller
 DLog(@"sending config %@", gameDictionary);
 if ([[gameDictionary allKeys] count] == 11) {
 NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:gameDictionary,@"game_dictionary", @"",@"savefile",
 [NSNumber numberWithBool:NO],@"netgame", nil];
 [[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary];
 // tell controllers that they're being reloaded
-[mapConfigViewController viewWillAppear:YES];
+[self.mapConfigViewController viewWillAppear:YES];
+[self.schemeWeaponConfigViewController viewWillAppear:YES];
 } else {
-DLog(@"gameconfig data not complete!!\nmapConfigViewController = %@\nteamConfigViewController = %@\nschemeWeaponConfigViewController = %@\n",
+DLog(@"gameconfig data not complete!!");
-mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController);
 [self.parentViewController dismissModalViewControllerAnimated:YES];
 // present an alert to the user, with an image on the ipad (too big for the iphone)
 NSString *msg = NSLocalizedString(@"Something went wrong with your configuration. Please try again.",@"");
 if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
 -(void) viewWillAppear:(BOOL)animated {
 if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
 [NSThread detachNewThreadSelector:@selector(loadNiceHogs) toTarget:self withObject:nil];
-[mapConfigViewController viewWillAppear:animated];
+[self.mapConfigViewController viewWillAppear:animated];
-[teamConfigViewController viewWillAppear:animated];
+[self.teamConfigViewController viewWillAppear:animated];
-[schemeWeaponConfigViewController viewWillAppear:animated];
+[self.schemeWeaponConfigViewController viewWillAppear:animated];
 // add other controllers here and below
 [super viewWillAppear:animated];
 }
 -(void) viewDidAppear:(BOOL)animated {
-[mapConfigViewController viewDidAppear:animated];
+[self.mapConfigViewController viewDidAppear:animated];
-[teamConfigViewController viewDidAppear:animated];
+[self.teamConfigViewController viewDidAppear:animated];
-[schemeWeaponConfigViewController viewDidAppear:animated];
+[self.schemeWeaponConfigViewController viewDidAppear:animated];
 [super viewDidAppear:animated];
 }
 -(void) viewWillDisappear:(BOOL)animated {
-[mapConfigViewController viewWillDisappear:animated];
+[self.mapConfigViewController viewWillDisappear:animated];
-[teamConfigViewController viewWillDisappear:animated];
+[self.teamConfigViewController viewWillDisappear:animated];
-[schemeWeaponConfigViewController viewWillDisappear:animated];
+[self.schemeWeaponConfigViewController viewWillDisappear:animated];
 [super viewWillDisappear:animated];
 }
 -(void) viewDidDisappear:(BOOL)animated {
-[mapConfigViewController viewDidDisappear:animated];
+[self.mapConfigViewController viewDidDisappear:animated];
-[teamConfigViewController viewDidDisappear:animated];
+[self.teamConfigViewController viewDidDisappear:animated];
-[schemeWeaponConfigViewController viewDidDisappear:animated];
+[self.schemeWeaponConfigViewController viewDidDisappear:animated];
 [super viewDidDisappear:animated];
 }
 -(void) didReceiveMemoryWarning {
-// Releases the view if it doesn't have a superview.
+if (self.mapConfigViewController.view.superview == nil)
-if (mapConfigViewController.view.superview == nil)
+self.mapConfigViewController = nil;
-mapConfigViewController = nil;
+if (self.teamConfigViewController.view.superview == nil)
-if (teamConfigViewController.view.superview == nil)
+self.teamConfigViewController = nil;
-teamConfigViewController = nil;
+if (self.schemeWeaponConfigViewController.view.superview == nil)
-if (schemeWeaponConfigViewController.view.superview == nil)
+self.schemeWeaponConfigViewController = nil;
-schemeWeaponConfigViewController = nil;
+if (self.helpPage.view.superview == nil)
-if (helpPage.view.superview == nil)
+self.helpPage = nil;
-helpPage = nil;
 // Release any cached data, images, etc that aren't in use.
 self.imgContainer = nil;
 MSG_MEMCLEAN();
 [super didReceiveMemoryWarning];

changeset 3971	5c82ee165ed5
parent 3948	24daa33a3114
child 3973	0d1a420531ef