equal
deleted
inserted
replaced
250 self.popupMenu = nil; |
250 self.popupMenu = nil; |
251 if (self.helpPage.view.superview == nil) |
251 if (self.helpPage.view.superview == nil) |
252 self.helpPage = nil; |
252 self.helpPage = nil; |
253 if (self.amvc.view.superview == nil) |
253 if (self.amvc.view.superview == nil) |
254 self.amvc = nil; |
254 self.amvc = nil; |
255 if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) |
255 if (IS_IPAD()) |
256 if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil) |
256 if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil) |
257 self.popoverController = nil; |
257 self.popoverController = nil; |
258 |
258 |
259 MSG_MEMCLEAN(); |
259 MSG_MEMCLEAN(); |
260 [super didReceiveMemoryWarning]; |
260 [super didReceiveMemoryWarning]; |
442 // on iphone instead just use the tableViewController directly (and implement manually all animations) |
442 // on iphone instead just use the tableViewController directly (and implement manually all animations) |
443 -(IBAction) showPopover{ |
443 -(IBAction) showPopover{ |
444 CGRect screen = [[UIScreen mainScreen] bounds]; |
444 CGRect screen = [[UIScreen mainScreen] bounds]; |
445 isPopoverVisible = YES; |
445 isPopoverVisible = YES; |
446 |
446 |
447 if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
447 if (IS_IPAD()) { |
448 if (self.popupMenu == nil) |
448 if (self.popupMenu == nil) |
449 self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
449 self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain]; |
450 if (self.popoverController == nil) { |
450 if (self.popoverController == nil) { |
451 self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu]; |
451 self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu]; |
452 [self.popoverController setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; |
452 [self.popoverController setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; |
472 if (YES == isPopoverVisible) { |
472 if (YES == isPopoverVisible) { |
473 isPopoverVisible = NO; |
473 isPopoverVisible = NO; |
474 if (HW_isPaused()) |
474 if (HW_isPaused()) |
475 HW_pause(); |
475 HW_pause(); |
476 |
476 |
477 if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
477 if (IS_IPAD()) { |
478 [(InGameMenuViewController *)[[self popoverController] contentViewController] removeChat]; |
478 [(InGameMenuViewController *)[[self popoverController] contentViewController] removeChat]; |
479 [self.popoverController dismissPopoverAnimated:YES]; |
479 [self.popoverController dismissPopoverAnimated:YES]; |
480 } else { |
480 } else { |
481 [self.popupMenu dismiss]; |
481 [self.popupMenu dismiss]; |
482 } |
482 } |