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

Sort damaged equipment to top of status screen list

Browse Source
This commit is contained in:
cim 2014-07-25 15:59:19 +01:00
parent 65e5a0befa
commit 715922f2f4
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7027,7 +7027,8 @@ static GLfloat sBaseMass = 0.0;
- (NSArray *) equipmentList - (NSArray *) equipmentList
{ {
NSMutableArray *quip = [NSMutableArray array]; NSMutableArray *quip1 = [NSMutableArray array]; // damaged
NSMutableArray *quip2 = [NSMutableArray array]; // working
NSEnumerator *eqTypeEnum = nil; NSEnumerator *eqTypeEnum = nil;
OOEquipmentType *eqType = nil; OOEquipmentType *eqType = nil;
NSString *desc = nil; NSString *desc = nil;
@ -7038,7 +7039,7 @@ static GLfloat sBaseMass = 0.0;
{ {
if ([self hasEquipmentItem:[eqType identifier]]) if ([self hasEquipmentItem:[eqType identifier]])
{ {
[quip addObject:[NSArray arrayWithObjects:[eqType name], [NSNumber numberWithBool:YES], nil]]; [quip2 addObject:[NSArray arrayWithObjects:[eqType name], [NSNumber numberWithBool:YES], nil]];
} }
else else
{ {
@ -7046,7 +7047,7 @@ static GLfloat sBaseMass = 0.0;
if ([self hasEquipmentItem:[[eqType identifier] stringByAppendingString:@"_DAMAGED"]]) if ([self hasEquipmentItem:[[eqType identifier] stringByAppendingString:@"_DAMAGED"]])
{ {
desc = [NSString stringWithFormat:DESC(@"equipment-@-not-available"), [eqType name]]; desc = [NSString stringWithFormat:DESC(@"equipment-@-not-available"), [eqType name]];
[quip addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:NO], nil]]; [quip1 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:NO], nil]];
} }
} }
} }
@ -7055,31 +7056,33 @@ static GLfloat sBaseMass = 0.0;
if (max_passengers > 0) if (max_passengers > 0)
{ {
desc = [NSString stringWithFormat:DESC_PLURAL(@"equipment-pass-berth-@", max_passengers), max_passengers]; desc = [NSString stringWithFormat:DESC_PLURAL(@"equipment-pass-berth-@", max_passengers), max_passengers];
[quip addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]]; [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]];
} }
if (forward_weapon_type > WEAPON_NONE) if (forward_weapon_type > WEAPON_NONE)
{ {
desc = [NSString stringWithFormat:DESC(@"equipment-fwd-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(forward_weapon_type)] name]]; desc = [NSString stringWithFormat:DESC(@"equipment-fwd-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(forward_weapon_type)] name]];
[quip addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]]; [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]];
} }
if (aft_weapon_type > WEAPON_NONE) if (aft_weapon_type > WEAPON_NONE)
{ {
desc = [NSString stringWithFormat:DESC(@"equipment-aft-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(aft_weapon_type)] name]]; desc = [NSString stringWithFormat:DESC(@"equipment-aft-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(aft_weapon_type)] name]];
[quip addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]]; [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]];
} }
if (port_weapon_type > WEAPON_NONE) if (port_weapon_type > WEAPON_NONE)
{ {
desc = [NSString stringWithFormat:DESC(@"equipment-port-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(port_weapon_type)] name]]; desc = [NSString stringWithFormat:DESC(@"equipment-port-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(port_weapon_type)] name]];
[quip addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]]; [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]];
} }
if (starboard_weapon_type > WEAPON_NONE) if (starboard_weapon_type > WEAPON_NONE)
{ {
desc = [NSString stringWithFormat:DESC(@"equipment-stb-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(starboard_weapon_type)] name]]; desc = [NSString stringWithFormat:DESC(@"equipment-stb-weapon-@"),[[OOEquipmentType equipmentTypeWithIdentifier:OOEquipmentIdentifierFromWeaponType(starboard_weapon_type)] name]];
[quip addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]]; [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil]];
} }
return quip; // list damaged first, then working
[quip1 addObjectsFromArray:quip2];
return quip1;
} }