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

- Spelling corrections.

Browse Source 
- Reverted a accidentally committed file

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4394 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2011-02-22 20:02:08 +00:00
parent 5959f6b60e
commit 6d1743d8c8
2 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/descriptions.plist
View File

@ -1281,7 +1281,7 @@
"capture-reward-for-@@-@-credits" = "For capturing %@, %@, you’re paid a bounty of %@ ₢.\n";
"rescue-reward-for-@@-@-credits-@-alt" = (
"For rescuing %@, %@, their insurance pays %@ ₢. This includes a %@ ₢ bribe for clearing the offender status.\n",
"Police officers are waiting for %@, %@, but after a hasty discussion and an exchange of credits they depart. Insurance pays you %@ ₢. (%@ ₢ went into the bribe).\n"
"Police officers are waiting for %@, %@, but after a hasty discussion and an exchange of credits they depart. Insurance pays you %@ ₢. (%@ ₢ went into the bribe.)\n"
);
"capture-reward-for-@@-@-credits-@-alt" = (
"For capturing %@, %@, you’re paid a bounty of %@ ₢. The insurance fee of %@ goes to governmental taxes.\n",

42
src/Core/Entities/PlayerEntityLoadSave.m
View File

@ -551,23 +551,12 @@ static uint16_t PersonalityForCommanderDict(NSDictionary *dict);
fileTypes = [NSArray arrayWithObject:@"oolite-save"];
oPanel = [NSOpenPanel openPanel];
/*
// runModalForDirectory is deprecated per OSX 10.6
[oPanel setAllowsMultipleSelection:NO];
result = [oPanel runModalForDirectory:nil file:nil types:fileTypes];
if (result == NSOKButton)
{
return [self loadPlayerFromFile:[oPanel filename]];
}
*/
// if (save_path) [oPanel setDirectoryURL:(NSURL *)save_path]; //Needs SNOW_LEOPARD
[oPanel setAllowedFileTypes:fileTypes];
result = [oPanel runModal];
if (result == NSFileHandlingPanelOKButton)
{
return [self loadPlayerFromFile:[oPanel filename]];
}
else
{
return NO;
@ -575,37 +564,6 @@ static uint16_t PersonalityForCommanderDict(NSDictionary *dict);
}
/*
- (void) savePlayerWithPanel
{
NSSavePanel *sp;
int runResult;
sp = [NSSavePanel savePanel];
[sp setRequiredFileType:@"oolite-save"];
[sp setCanSelectHiddenExtension:YES];
// if (player_name) [sp setNameFieldStringValue:player_name]; //Needs SNOW_LEOPARD
// display the NSSavePanel
runResult = [sp runModal];
// if successful, save file under designated name
if (runResult == NSFileHandlingPanelOKButton)
{
NSArray* path_components = [[sp filename] pathComponents];
NSString* new_name = [[path_components objectAtIndex:[path_components count]-1] stringByDeletingPathExtension];
[self doScriptEvent:@"playerWillSaveGame" withArgument:@"standardSave"];
[player_name release];
player_name = [new_name copy];
[self writePlayerToPath:[sp filename]];
}
[self setGuiToStatusScreen];
}
*/
- (void) savePlayerWithPanel
{
NSSavePanel *sp;