diff options
Diffstat (limited to 'platform/iphone/view_controller.mm')
| -rw-r--r-- | platform/iphone/view_controller.mm | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/platform/iphone/view_controller.mm b/platform/iphone/view_controller.mm index 2b9027e042..574598e1d3 100644 --- a/platform/iphone/view_controller.mm +++ b/platform/iphone/view_controller.mm @@ -33,44 +33,43 @@ extern "C" { - int add_path(int, char**); - int add_cmdline(int, char**); +int add_path(int, char **); +int add_cmdline(int, char **); - int add_path(int p_argc, char** p_args) { - - NSString* str = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_path"]; - if (!str) - return p_argc; - - p_args[p_argc++] = "-path"; - [str retain]; // memory leak lol (maybe make it static here and delete it in ViewController destructor? @todo - p_args[p_argc++] = (char*)[str cString]; - p_args[p_argc] = NULL; +int add_path(int p_argc, char **p_args) { + NSString *str = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_path"]; + if (!str) return p_argc; - }; - int add_cmdline(int p_argc, char** p_args) { + p_args[p_argc++] = "-path"; + [str retain]; // memory leak lol (maybe make it static here and delete it in ViewController destructor? @todo + p_args[p_argc++] = (char *)[str cString]; + p_args[p_argc] = NULL; - NSArray* arr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_cmdline"]; - if (!arr) - return p_argc; + return p_argc; +}; - for (int i=0; i < [arr count]; i++) { +int add_cmdline(int p_argc, char **p_args) { - NSString* str = [arr objectAtIndex:i]; - if (!str) - continue; - [str retain]; // @todo delete these at some point - p_args[p_argc++] = (char*)[str cString]; - }; + NSArray *arr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_cmdline"]; + if (!arr) + return p_argc; - p_args[p_argc] = NULL; + for (int i = 0; i < [arr count]; i++) { - return p_argc; + NSString *str = [arr objectAtIndex:i]; + if (!str) + continue; + [str retain]; // @todo delete these at some point + p_args[p_argc++] = (char *)[str cString]; }; + p_args[p_argc] = NULL; + + return p_argc; }; +}; // extern "C" @interface ViewController () @@ -85,11 +84,11 @@ extern "C" { - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)p_orientation { - if (/*OSIPhone::get_singleton() == NULL*/TRUE) { + if (/*OSIPhone::get_singleton() == NULL*/ TRUE) { printf("checking on info.plist\n"); - NSArray* arr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"UISupportedInterfaceOrientations"]; - switch(p_orientation) { + NSArray *arr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"UISupportedInterfaceOrientations"]; + switch (p_orientation) { case UIInterfaceOrientationLandscapeLeft: return [arr indexOfObject:@"UIInterfaceOrientationLandscapeLeft"] != NSNotFound ? YES : NO; @@ -109,22 +108,22 @@ extern "C" { }; uint8_t supported = OSIPhone::get_singleton()->get_orientations(); - switch(p_orientation) { + switch (p_orientation) { - case UIInterfaceOrientationLandscapeLeft: - return supported & (1<<OSIPhone::LandscapeLeft) ? YES : NO; + case UIInterfaceOrientationLandscapeLeft: + return supported & (1 << OSIPhone::LandscapeLeft) ? YES : NO; - case UIInterfaceOrientationLandscapeRight: - return supported & (1<<OSIPhone::LandscapeRight) ? YES : NO; + case UIInterfaceOrientationLandscapeRight: + return supported & (1 << OSIPhone::LandscapeRight) ? YES : NO; - case UIInterfaceOrientationPortrait: - return supported & (1<<OSIPhone::PortraitDown) ? YES : NO; + case UIInterfaceOrientationPortrait: + return supported & (1 << OSIPhone::PortraitDown) ? YES : NO; - case UIInterfaceOrientationPortraitUpsideDown: - return supported & (1<<OSIPhone::PortraitUp) ? YES : NO; + case UIInterfaceOrientationPortraitUpsideDown: + return supported & (1 << OSIPhone::PortraitUp) ? YES : NO; - default: - return NO; + default: + return NO; } }; @@ -133,7 +132,7 @@ extern "C" { } #ifdef GAME_CENTER_ENABLED -- (void) gameCenterViewControllerDidFinish:(GKGameCenterViewController*) gameCenterViewController { +- (void)gameCenterViewControllerDidFinish:(GKGameCenterViewController *)gameCenterViewController { //[gameCenterViewController dismissViewControllerAnimated:YES completion:^{GameCenter::get_singleton()->game_center_closed();}];//version for signaling when overlay is completely gone GameCenter::get_singleton()->game_center_closed(); [gameCenterViewController dismissViewControllerAnimated:YES completion:nil]; |