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

Fix weapon loading from shipdata

Browse Source
This commit is contained in:
cim 2014-09-28 21:14:37 +01:00
parent 845bd30531
commit e1447d70ae
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/OOConstToString.m
View File

@ -253,7 +253,7 @@ NSString *OOStringFromWeaponType(OOWeaponType weapon)
OOWeaponType OOWeaponTypeFromString(NSString *string)
{
return [OOEquipmentType equipmentTypeWithIdentifier:string];
return OOWeaponTypeFromEquipmentIdentifierSloppy(string);
}
@ -268,6 +268,14 @@ OOWeaponType OOWeaponTypeFromEquipmentIdentifierSloppy(NSString *string)
OOWeaponType w = [OOEquipmentType equipmentTypeWithIdentifier:string];
if (w == nil)
{
if (![string hasPrefix:@"EQ_"])
{
w = [OOEquipmentType equipmentTypeWithIdentifier:[NSString stringWithFormat:@"EQ_%@",string]];
if (w != nil)
{
return w;
}
}
return [OOEquipmentType equipmentTypeWithIdentifier:@"EQ_WEAPON_NONE"];
}
return w;
@ -302,7 +310,7 @@ OOWeaponType OOWeaponTypeFromEquipmentIdentifierLegacy(NSString *string)
OOWeaponType OOWeaponTypeFromEquipmentIdentifierStrict(NSString *string)
{
// there is no significant difference between the two any more
// there is no difference between the two any more
return OOWeaponTypeFromEquipmentIdentifierSloppy(string);
}