Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only clear chart screen when switching screens and switch off pause key for text entry

Browse Source
This commit is contained in:
Kevin Anthoney 2014-07-19 16:55:03 +01:00
parent b5f182a4e1
commit 0e122bd786
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Entities/PlayerEntity.m
View File

@ -7574,7 +7574,7 @@ static GLfloat sBaseMass = 0.0;
// GUI stuff
{
[gui clearAndKeepBackground:!guiChanged];
//[gui clearAndKeepBackground:!guiChanged];
NSString *gal_key = [NSString stringWithFormat:@"long-range-chart-title-%d", galaxy_number];
if ([[UNIVERSE descriptions] valueForKey:gal_key] == nil)
{
@ -7600,7 +7600,6 @@ static GLfloat sBaseMass = 0.0;
}
else
{
[gui setText: @"Test" forRow: GUI_ROW_CHART_SYSTEM+1];
[gui setShowTextCursor:NO];
}
}

5
src/Core/Entities/PlayerEntityControls.m
View File

@ -3274,6 +3274,7 @@ static NSTimeInterval time_last_frame;
chart_mode = CHART_MODE_LONG_RANGE;
}
}
[gui clearAndKeepBackground: NO];
[self setGuiToShortRangeChartScreen];
}
}
@ -3430,7 +3431,7 @@ static BOOL autopilot_pause;
toggling_music = NO;
}
// look for the pause game, 'p' key
if ([gameView isDown:key_pausebutton] && gui_screen != GUI_SCREEN_LONG_RANGE_CHART && gui_screen != GUI_SCREEN_MISSION)
if ([gameView isDown:key_pausebutton] && !(gui_screen == GUI_SCREEN_SHORT_RANGE_CHART && chart_mode == CHART_MODE_LONG_RANGE) && gui_screen != GUI_SCREEN_MISSION)
{
if (!autopilot_pause)
{
@ -3478,7 +3479,7 @@ static BOOL autopilot_pause;
{
// Pause game, 'p' key
exceptionContext = @"pause key";
if ([gameView isDown:key_pausebutton] && (gui_screen != GUI_SCREEN_LONG_RANGE_CHART &&
if ([gameView isDown:key_pausebutton] && (!(gui_screen == GUI_SCREEN_SHORT_RANGE_CHART && chart_mode == CHART_MODE_LONG_RANGE) &&
gui_screen != GUI_SCREEN_MISSION && gui_screen != GUI_SCREEN_REPORT &&
gui_screen != GUI_SCREEN_SAVE) )
{