equal
deleted
inserted
replaced
19 */ |
19 */ |
20 |
20 |
21 |
21 |
22 #import "OverlayViewController.h" |
22 #import "OverlayViewController.h" |
23 #import "InGameMenuViewController.h" |
23 #import "InGameMenuViewController.h" |
24 #import "HelpPageViewController.h" |
24 #import "HelpPageInGameViewController.h" |
25 #import "CGPointUtils.h" |
25 #import "CGPointUtils.h" |
26 |
26 |
27 |
27 |
28 #define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
28 #define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7] |
29 #define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
29 #define HIDING_TIME_NEVER [NSDate dateWithTimeIntervalSinceNow:10000] |
267 #pragma mark - |
267 #pragma mark - |
268 #pragma mark in-game menu and help page |
268 #pragma mark in-game menu and help page |
269 -(void) showHelp:(id) sender { |
269 -(void) showHelp:(id) sender { |
270 if (self.helpPage == nil) { |
270 if (self.helpPage == nil) { |
271 NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone"); |
271 NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone"); |
272 self.helpPage = [[HelpPageViewController alloc] initWithNibName:xibName bundle:nil]; |
272 self.helpPage = [[HelpPageInGameViewController alloc] initWithNibName:xibName bundle:nil]; |
273 } |
273 } |
274 self.helpPage.view.alpha = 0; |
274 self.helpPage.view.alpha = 0; |
275 [self.view addSubview:helpPage.view]; |
275 [self.view addSubview:helpPage.view]; |
276 [UIView beginAnimations:@"helpingame" context:NULL]; |
276 [UIView beginAnimations:@"helpingame" context:NULL]; |
277 self.helpPage.view.alpha = 1; |
277 self.helpPage.view.alpha = 1; |