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

Fixed incorrect display of distance and time on Advanced Navigational Array when unreachable systems were targeted.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2725 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2009-11-06 16:32:58 +00:00
parent 89df01f9bb
commit bde26b04df
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Config/descriptions.plist
View File

@ -983,6 +983,7 @@
"long-range-chart-distance-f" = "Distance: %.1f Light Years";
"long-range-chart-est-travel-time-f" = "Estimated Travel Time: %.1f Hours";
"long-range-chart-find-planet-@" = "Find planet: %@";
"long-range-chart-system-unreachable" = "System Unreachable";
// Market screen
"@-commodity-market" = "%@ Commodity Market";

23
src/Core/GuiDisplayGen.m
View File

@ -1348,6 +1348,7 @@ OOINLINE BOOL RowInRange(OOGUIRow row, NSRange range)
double hoffset = 0.0f;
double voffset = size_in_pixels.height - pixel_title_size.height - 5;
OORouteType advancedNavArrayMode = OPTIMIZED_BY_NONE;
BOOL routeExists = YES;
int i;
double distance, time;
@ -1359,10 +1360,15 @@ OOINLINE BOOL RowInRange(OOGUIRow row, NSRange range)
int planetNumber = [UNIVERSE findSystemNumberAtCoords:galaxy_coordinates withGalaxySeed:galaxy_seed];
int destNumber = [UNIVERSE findSystemNumberAtCoords:cursor_coordinates withGalaxySeed:galaxy_seed];
NSDictionary* routeInfo = [UNIVERSE routeFromSystem:planetNumber toSystem:destNumber optimizedBy:advancedNavArrayMode];
if (!routeInfo) routeExists = NO;
[self drawAdvancedNavArrayAtX:x y:y z:z alpha:alpha usingRoute: (planetNumber != destNumber ? routeInfo : nil) optimizedBy:advancedNavArrayMode];
distance = [routeInfo oo_doubleForKey:@"distance"];
time = [routeInfo oo_doubleForKey:@"time"];
if (routeExists)
{
distance = [routeInfo oo_doubleForKey:@"distance"];
time = [routeInfo oo_doubleForKey:@"time"];
}
}
else
{
@ -1371,9 +1377,16 @@ OOINLINE BOOL RowInRange(OOGUIRow row, NSRange range)
time = distance * distance;
}
[self setText:[NSString stringWithFormat:DESC(@"long-range-chart-distance-f"), distance] forRow:18];
[self setText:(advancedNavArrayMode != OPTIMIZED_BY_NONE ?
[NSString stringWithFormat:DESC(@"long-range-chart-est-travel-time-f"), time] : @"") forRow:19];
if (routeExists)
{
[self setText:[NSString stringWithFormat:DESC(@"long-range-chart-distance-f"), distance] forRow:18];
[self setText:(advancedNavArrayMode != OPTIMIZED_BY_NONE ?
[NSString stringWithFormat:DESC(@"long-range-chart-est-travel-time-f"), time] : @"") forRow:19];
}
else
{
[self setText:DESC(@"long-range-chart-system-unreachable") forRow:18];
}
// draw fuel range circle
//