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

- fixed: Bug #17193 - Inline expand{Description|MissionText}() subst. priority.

Browse Source 
Substitution priority for expandDescription() & expandMissionText(): local, inline overrides now take precedence over mission variables and description.plist entries. This includes a fix for the corresponding leqacy script bug: local variables now take precedence over description.plist entries! ( maintenance & trunk )

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3690 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2010-07-20 16:00:31 +00:00
parent d1bc46dceb
commit 1716d54ac2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/OOStringParsing.m
View File

@ -345,6 +345,9 @@ NSString *ExpandDescriptionsWithLocalsForSystemSeedName(NSString *text, Random_S
after = [partial substringWithRange:NSMakeRange(p2,[partial length] - p2)]; after = [partial substringWithRange:NSMakeRange(p2,[partial length] - p2)];
middle = [partial substringWithRange:NSMakeRange(p1 + 1 , p2 - p1 - 2)]; middle = [partial substringWithRange:NSMakeRange(p1 + 1 , p2 - p1 - 2)];
// replace all local variables first!
part = ReplaceVariables(middle, NULL, locals);
// check all_descriptions for an array that's keyed to middle // check all_descriptions for an array that's keyed to middle
value = [all_descriptions objectForKey:middle]; value = [all_descriptions objectForKey:middle];
if ([value isKindOfClass:[NSArray class]] && [value count] > 0) if ([value isKindOfClass:[NSArray class]] && [value count] > 0)
@ -399,11 +402,6 @@ NSString *ExpandDescriptionsWithLocalsForSystemSeedName(NSString *text, Random_S
} }
} }
} }
else
{
// do replacement of mission and local variables here instead
part = ReplaceVariables(middle, NULL, locals);
}
partial = [NSMutableString stringWithFormat:@"%@%@%@",before,part,after]; partial = [NSMutableString stringWithFormat:@"%@%@%@",before,part,after];
} }