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

- Oops!

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2502 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2009-09-13 21:35:11 +00:00
parent cd8b7791ee
commit ee136c29f1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1118,9 +1118,10 @@ static PlayerEntity *sSharedPlayer = nil;
NSString *hud_desc = [shipDict oo_stringForKey:@"hud" defaultValue:@"hud.plist"];
NSDictionary *huddict = [ResourceManager dictionaryFromFilesNamed:hud_desc inFolder:@"Config" andMerge:YES];
// hud defined, but buggy?
if (huddict == nil)
{
NSDictionary *huddict = [ResourceManager dictionaryFromFilesNamed:@"hud.plist" inFolder:@"Config" andMerge:YES];
huddict = [ResourceManager dictionaryFromFilesNamed:@"hud.plist" inFolder:@"Config" andMerge:YES];
}
// buggy oxp could override hud.plist with a non-dictionary.
if (huddict != nil)