From da4b3f7361394ce892ee8cfc37b42dab8d71fda1 Mon Sep 17 00:00:00 2001 From: Kevin Anthoney Date: Wed, 25 Jan 2017 13:16:48 +0000 Subject: [PATCH] Remove jumps line from long range chart and contracts screen to avoid clashes --- Resources/Config/descriptions.plist | 4 +--- src/Core/GuiDisplayGen.m | 15 +++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Resources/Config/descriptions.plist b/Resources/Config/descriptions.plist index 00b961e7..b66145f1 100644 --- a/Resources/Config/descriptions.plist +++ b/Resources/Config/descriptions.plist @@ -1455,13 +1455,12 @@ // Short and Long Range Chart Overrides "charts-distance" = "Distance: [distance|precision:1] Light Years"; "charts-est-travel-time" = "Estimated Travel Time: [time|precision:1] Hours"; - "charts-jumps" = "Jumps: [jumps]"; // Short Range Chart Screen "short-range-chart-title" = "Short Range Chart"; "short-range-chart-distance" = "[charts-distance]"; "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-title-d" = "Galactic Chart %d"; @@ -1480,7 +1479,6 @@ "long-range-chart-distance" = "[charts-distance]"; "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-system-unreachable" = "System Unreachable"; diff --git a/src/Core/GuiDisplayGen.m b/src/Core/GuiDisplayGen.m index 237b7c98..dd24b36d 100644 --- a/src/Core/GuiDisplayGen.m +++ b/src/Core/GuiDisplayGen.m @@ -2208,13 +2208,16 @@ static OOTextureSprite *NewTextureSpriteWithDescriptor(NSDictionary *descriptor) { [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]; - } - else - { - [self setArray:[NSArray arrayWithObjects: nil] forRow: textRow + 1]; + if (jumps > 0) + { + [self setArray:[NSArray arrayWithObjects: @"", OOExpandKey(@"short-range-chart-jumps", jumps), nil] forRow: textRow + 1]; + } + else + { + [self setArray:[NSArray arrayWithObjects: nil] forRow: textRow + 1]; + } } [targetName release];