From 3d31560ac63188c8c6c8b676704b542aacfaa504 Mon Sep 17 00:00:00 2001 From: phkb Date: Wed, 26 Jul 2017 09:04:11 +1000 Subject: [PATCH] Weapons and passenger berth displayColor picked up for status screen --- src/Core/Entities/PlayerEntity.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m index 0aebef57..32d27314 100644 --- a/src/Core/Entities/PlayerEntity.m +++ b/src/Core/Entities/PlayerEntity.m @@ -7867,28 +7867,28 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market); if (max_passengers > 0) { desc = [NSString stringWithFormat:DESC_PLURAL(@"equipment-pass-berth-@", max_passengers), max_passengers]; - [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil, nil]]; + [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], [[OOEquipmentType equipmentTypeWithIdentifier:@"EQ_PASSENGER_BERTH"] displayColor], nil]]; } if (!isWeaponNone(forward_weapon_type)) { desc = [NSString stringWithFormat:DESC(@"equipment-fwd-weapon-@"),[forward_weapon_type name]]; - [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil, nil]]; + [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], [forward_weapon_type displayColor], nil]]; } if (!isWeaponNone(aft_weapon_type)) { desc = [NSString stringWithFormat:DESC(@"equipment-aft-weapon-@"),[aft_weapon_type name]]; - [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil, nil]]; + [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], [aft_weapon_type displayColor], nil]]; } if (!isWeaponNone(port_weapon_type)) { desc = [NSString stringWithFormat:DESC(@"equipment-port-weapon-@"),[port_weapon_type name]]; - [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil, nil]]; + [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], [port_weapon_type displayColor], nil]]; } if (!isWeaponNone(starboard_weapon_type)) { desc = [NSString stringWithFormat:DESC(@"equipment-stb-weapon-@"),[starboard_weapon_type name]]; - [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], nil, nil]]; + [quip2 addObject:[NSArray arrayWithObjects:desc, [NSNumber numberWithBool:YES], [starboard_weapon_type displayColor], nil]]; } // list damaged first, then working