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

Remove jumps line from long range chart and contracts screen to avoid clashes

Browse Source
This commit is contained in:
Kevin Anthoney 2017-01-25 13:16:48 +00:00
parent 9d5ffb47aa
commit da4b3f7361
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Config/descriptions.plist
View File

@ -1455,13 +1455,12 @@
// Short and Long Range Chart Overrides // Short and Long Range Chart Overrides
"charts-distance" = "Distance: [distance|precision:1] Light Years"; "charts-distance" = "Distance: [distance|precision:1] Light Years";
"charts-est-travel-time" = "Estimated Travel Time: [time|precision:1] Hours"; "charts-est-travel-time" = "Estimated Travel Time: [time|precision:1] Hours";
"charts-jumps" = "Jumps: [jumps]";
// Short Range Chart Screen // Short Range Chart Screen
"short-range-chart-title" = "Short Range Chart"; "short-range-chart-title" = "Short Range Chart";
"short-range-chart-distance" = "[charts-distance]"; "short-range-chart-distance" = "[charts-distance]";
"short-range-chart-est-travel-time" = "[charts-est-travel-time]"; "short-range-chart-est-travel-time" = "[charts-est-travel-time]";
"short-range-chart-jumps" = "[charts-jumps]"; "short-range-chart-jumps" = "Jumps: [jumps]";
// Long Range Chart Screen // Long Range Chart Screen
"long-range-chart-title-d" = "Galactic Chart %d"; "long-range-chart-title-d" = "Galactic Chart %d";
@ -1480,7 +1479,6 @@
"long-range-chart-distance" = "[charts-distance]"; "long-range-chart-distance" = "[charts-distance]";
"long-range-chart-est-travel-time" = "[charts-est-travel-time]"; "long-range-chart-est-travel-time" = "[charts-est-travel-time]";
"long-range-chart-jumps" = "[charts-jumps]";
"long-range-chart-find-planet-@" = "Find planet: %@"; "long-range-chart-find-planet-@" = "Find planet: %@";
"long-range-chart-system-unreachable" = "System Unreachable"; "long-range-chart-system-unreachable" = "System Unreachable";

15
src/Core/GuiDisplayGen.m
View File

@ -2208,13 +2208,16 @@ static OOTextureSprite *NewTextureSpriteWithDescriptor(NSDictionary *descriptor)
{ {
[self setArray:[NSArray arrayWithObjects:@"", travelDistLine,travelTimeLine,nil] forRow:textRow]; [self setArray:[NSArray arrayWithObjects:@"", travelDistLine,travelTimeLine,nil] forRow:textRow];
} }
if (jumps > 0) if ([PLAYER guiScreen] == GUI_SCREEN_SHORT_RANGE_CHART)
{ {
[self setArray:[NSArray arrayWithObjects: @"", OOExpandKey(@"long-range-chart-jumps", jumps), nil] forRow: textRow + 1]; if (jumps > 0)
} {
else [self setArray:[NSArray arrayWithObjects: @"", OOExpandKey(@"short-range-chart-jumps", jumps), nil] forRow: textRow + 1];
{ }
[self setArray:[NSArray arrayWithObjects: nil] forRow: textRow + 1]; else
{
[self setArray:[NSArray arrayWithObjects: nil] forRow: textRow + 1];
}
} }
[targetName release]; [targetName release];