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

Changed %X string code to %N.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1893 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2008-12-05 12:33:56 +00:00
parent eae4c8e765
commit bc07f0e740
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/Config/descriptions.plist
View File

@ -437,6 +437,7 @@
/* %H - homeworld /* %H - homeworld
%I - homeworld+ian %I - homeworld+ian
%R - random digrams %R - random digrams
%N - better random digrams
%@ - text to be inserted at this point %@ - text to be inserted at this point
%d, %f, %x etc. - printf type variables to be inserted %d, %f, %x etc. - printf type variables to be inserted
[$text] = $text is an entry here that will be expanded [$text] = $text is an entry here that will be expanded
@ -965,7 +966,7 @@
"loadfailed-no-file-specified" = "No file specified!"; "loadfailed-no-file-specified" = "No file specified!";
"loadfailed-could-not-load-file" = "Could not load file."; "loadfailed-could-not-load-file" = "Could not load file.";
"loadfailed-could-not-find-ship-type-@-please-reinstall-the-appropriate-OXP" "loadfailed-could-not-find-ship-type-@-please-reinstall-the-appropriate-OXP"
= "Could not find ship type \"%@\" - please reinstall the appropriate OXP."; = "Could not find ship type “%@” - please reinstall the appropriate OXP.";
"loadfailed-invalid-saved-game-no-ship-specified" "loadfailed-invalid-saved-game-no-ship-specified"
= "Invalid saved game - no ship specified."; = "Invalid saved game - no ship specified.";
"loadfailed-could-not-set-up-player-ship" = "Could not set up player ship."; "loadfailed-could-not-set-up-player-ship" = "Could not set up player ship.";

4
src/Core/OOStringParsing.m
View File

@ -366,7 +366,7 @@ NSString *ExpandDescriptionsWithLocalsForSystemSeed(NSString *text, Random_Seed
withString:OldRandomDigrams() withString:OldRandomDigrams()
options:NSLiteralSearch range:NSMakeRange(0, [partial length])]; options:NSLiteralSearch range:NSMakeRange(0, [partial length])];
[partial replaceOccurrencesOfString:@"%X" [partial replaceOccurrencesOfString:@"%N"
withString:NewRandomDigrams() withString:NewRandomDigrams()
options:NSLiteralSearch range:NSMakeRange(0, [partial length])]; options:NSLiteralSearch range:NSMakeRange(0, [partial length])];
@ -458,7 +458,7 @@ static NSString *OldRandomDigrams(void)
/* Generates pseudo-random digram string using gen_rnd_number() /* Generates pseudo-random digram string using gen_rnd_number()
(world-generation consistent PRNG). Used for "%X" description string. (world-generation consistent PRNG). Used for "%N" description string.
*/ */
static NSString *NewRandomDigrams(void) static NSString *NewRandomDigrams(void)
{ {