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

Fixed PlayerEntity.m Linux build warnings.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4201 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
getafix 2011-01-30 19:19:15 +00:00
parent 62579128ca
commit 3dda3bce94
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5613,7 +5613,7 @@ done:
[gui setTitle:DESC(@"short-range-chart-title")]; [gui setTitle:DESC(@"short-range-chart-title")];
[gui setText:targetSystemName forRow:19]; [gui setText:targetSystemName forRow:19];
[gui setText:[NSString stringWithFormat:DESC(@"short-range-chart-distance-f"), distance] forRow:20]; [gui setText:[NSString stringWithFormat:DESC(@"short-range-chart-distance-f"), distance] forRow:20];
if ([self hasHyperspaceMotor]) [gui setText:((distance > 0.0 && distance <= (double)fuel/10.0) ? [NSString stringWithFormat:DESC(@"short-range-chart-est-travel-time-f"), estimatedTravelTime] : @"") forRow:21]; if ([self hasHyperspaceMotor]) [gui setText:((distance > 0.0 && distance <= (double)fuel/10.0) ? (NSString *)[NSString stringWithFormat:DESC(@"short-range-chart-est-travel-time-f"), estimatedTravelTime] : (NSString *)@"") forRow:21];
[gui setShowTextCursor:NO]; [gui setShowTextCursor:NO];
} }
/* ends */ /* ends */
@ -6238,7 +6238,7 @@ static NSString *last_outfitting_key=nil;
if (displayRow) // Always true for the first pass. The first pass is used to display the name of the weapon being purchased. if (displayRow) // Always true for the first pass. The first pass is used to display the name of the weapon being purchased.
{ {
[gui setKey:eqKey forRow:row]; [gui setKey:eqKey forRow:row];
[gui setArray:[NSArray arrayWithObjects:desc, (facing_count > 0 ? priceString : @""), nil] forRow:row]; [gui setArray:[NSArray arrayWithObjects:desc, (facing_count > 0 ? priceString : (NSString *)@""), nil] forRow:row];
row++; row++;
} }
facing_count++; facing_count++;
@ -7008,7 +7008,7 @@ static NSString *last_outfitting_key=nil;
[gui clearAndKeepBackground:!guiChanged]; [gui clearAndKeepBackground:!guiChanged];
[gui setTitle:[UNIVERSE sun] != NULL ? [NSString stringWithFormat:DESC(@"@-commodity-market"), [UNIVERSE getSystemName:system_seed]] : DESC(@"commodity-market")]; [gui setTitle:[UNIVERSE sun] != NULL ? (NSString *)[NSString stringWithFormat:DESC(@"@-commodity-market"), [UNIVERSE getSystemName:system_seed]] : DESC(@"commodity-market")];
OOGUITabSettings tab_stops; OOGUITabSettings tab_stops;
tab_stops[0] = 0; tab_stops[0] = 0;