Add game paused message in Game Options when in flight.
parent
15a7f107e0
commit
e4d06c78a2
|
@ -8941,6 +8941,7 @@ static NSString *SliderString(NSInteger amountIn20ths)
|
||||||
|
|
||||||
- (void) setGuiToLoadSaveScreen
|
- (void) setGuiToLoadSaveScreen
|
||||||
{
|
{
|
||||||
|
BOOL gamePaused = [[UNIVERSE gameController] isGamePaused];
|
||||||
BOOL canLoadOrSave = NO;
|
BOOL canLoadOrSave = NO;
|
||||||
MyOpenGLView *gameView = [UNIVERSE gameView];
|
MyOpenGLView *gameView = [UNIVERSE gameView];
|
||||||
OOGUIScreenID oldScreen = gui_screen;
|
OOGUIScreenID oldScreen = gui_screen;
|
||||||
|
@ -9003,7 +9004,7 @@ static NSString *SliderString(NSInteger amountIn20ths)
|
||||||
|
|
||||||
[gui setSelectableRange:NSMakeRange(first_sel_row, GUI_ROW_OPTIONS_END_OF_LIST)];
|
[gui setSelectableRange:NSMakeRange(first_sel_row, GUI_ROW_OPTIONS_END_OF_LIST)];
|
||||||
|
|
||||||
if ([[UNIVERSE gameController] isGamePaused] || (!canLoadOrSave && [self status] == STATUS_DOCKED))
|
if (gamePaused || (!canLoadOrSave && [self status] == STATUS_DOCKED))
|
||||||
{
|
{
|
||||||
[gui setSelectedRow: GUI_ROW(,GAMEOPTIONS)];
|
[gui setSelectedRow: GUI_ROW(,GAMEOPTIONS)];
|
||||||
}
|
}
|
||||||
|
@ -9022,13 +9023,20 @@ static NSString *SliderString(NSInteger amountIn20ths)
|
||||||
/* ends */
|
/* ends */
|
||||||
|
|
||||||
[[UNIVERSE gameView] clearMouse];
|
[[UNIVERSE gameView] clearMouse];
|
||||||
|
|
||||||
[self setShowDemoShips:NO];
|
[self setShowDemoShips:NO];
|
||||||
gui_screen = GUI_SCREEN_OPTIONS;
|
gui_screen = GUI_SCREEN_OPTIONS;
|
||||||
|
|
||||||
[self setShowDemoShips:NO];
|
|
||||||
[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
|
[UNIVERSE enterGUIViewModeWithMouseInteraction:YES];
|
||||||
[self noteGUIDidChangeFrom:oldScreen to:gui_screen];
|
|
||||||
|
if (gamePaused)
|
||||||
|
{
|
||||||
|
[[UNIVERSE messageGUI] clear];
|
||||||
|
NSString *pauseKey = [PLAYER keyBindingDescription:@"key_pausebutton"];
|
||||||
|
[UNIVERSE addMessage:OOExpandKey(@"game-paused-docked", pauseKey) forCount:1.0 forceDisplay:YES];
|
||||||
|
}
|
||||||
|
|
||||||
|
[self noteGUIDidChangeFrom:oldScreen to:gui_screen];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue