diff --git a/code/iphone/GameController.mm b/code/iphone/GameController.mm index 3206760..8f886da 100644 --- a/code/iphone/GameController.mm +++ b/code/iphone/GameController.mm @@ -122,6 +122,7 @@ bool iphoneControllerIsAvailable() { } } +#if !TARGET_OS_TV setupPauseButtonHandler(controller); // Register for controller connected/disconnected notifications @@ -140,6 +141,7 @@ bool iphoneControllerIsAvailable() { [ns addObserverForName:GCControllerDidDisconnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) { controller = nil; }]; +#endif } initialized = true; // Only need to do this once } diff --git a/code/iphone/MainMenuViewController.mm b/code/iphone/MainMenuViewController.mm index 00fcb2d..9d275ac 100755 --- a/code/iphone/MainMenuViewController.mm +++ b/code/iphone/MainMenuViewController.mm @@ -234,6 +234,7 @@ BOOL settingsMenuSelected = NO; [ gAppDelegate ShowGLView ]; ResumeGame(); + paused = false; Sound_StartLocalSound( "iphone/baborted_01.wav" ); @@ -596,6 +597,7 @@ BOOL settingsMenuSelected = NO; - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator { if (!context.previouslyFocusedView && [context.nextFocusedView isKindOfClass:[Banner_SubItem class]]) { [ gAppDelegate HideGLView ]; + paused = true; } } diff --git a/code/iphone/MissionMenuViewController.mm b/code/iphone/MissionMenuViewController.mm index b84515f..1d48b7b 100755 --- a/code/iphone/MissionMenuViewController.mm +++ b/code/iphone/MissionMenuViewController.mm @@ -466,6 +466,7 @@ static const char * const MissionNames[TOTAL_EPISODES][9] = { if (!context.previouslyFocusedView) { [ gAppDelegate HideGLView ]; + paused = true; } [super didUpdateFocusInContext:context withAnimationCoordinator:coordinator];