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

- requires_cargo_space now also works correct when implicit removing or adding repaired equipment.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4909 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2012-05-05 17:51:41 +00:00
parent 9e4f5f4cb3
commit 326de17a63
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Core/Entities/ShipEntity.m
View File

@ -2576,7 +2576,9 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
{
OOEquipmentType *eqType = nil;
NSString *lcEquipmentKey = [equipmentKey lowercaseString];
NSString *damagedKey;
BOOL isEqThargon = [lcEquipmentKey hasSuffix:@"thargon"] || [lcEquipmentKey hasPrefix:@"thargon"];
BOOL isRepairedEquipment = NO;
if([lcEquipmentKey isEqualToString:@"thargon"]) equipmentKey = @"EQ_THARGON";
@ -2591,7 +2593,12 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
{
eqType = [OOEquipmentType equipmentTypeWithIdentifier:equipmentKey];
// in case we have the damaged version!
[_equipment removeObject:[equipmentKey stringByAppendingString:@"_DAMAGED"]];
damagedKey = [equipmentKey stringByAppendingString:@"_DAMAGED"];
if ([_equipment containsObject:damagedKey])
{
[_equipment removeObject:damagedKey];
isRepairedEquipment = YES;
}
}
// does this equipment actually exist?
@ -2625,7 +2632,7 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
}
else
{
if (![equipmentKey isEqualToString:@"EQ_PASSENGER_BERTH"])
if (![equipmentKey isEqualToString:@"EQ_PASSENGER_BERTH"] && !isRepairedEquipment)
{
// Add to equipment_weight with all other equipment.
equipment_weight += [eqType requiredCargoSpace];
@ -2687,28 +2694,37 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
}
else
{
if ([equipmentKey isEqual:@"EQ_CARGO_BAY"] && [_equipment containsObject:equipmentKey])
if ([_equipment containsObject:equipmentKey])
{
max_cargo -= extra_cargo;
}
else
{
if ([_equipment containsObject:equipmentKey] && ![equipmentKey isEqualToString:@"EQ_PASSENGER_BERTH"])
if ([equipmentKey isEqual:@"EQ_CARGO_BAY"])
{
equipment_weight -= [eqType requiredCargoSpace]; // all other cases;
max_cargo -= extra_cargo;
}
else
{
if (![equipmentKey isEqualToString:@"EQ_PASSENGER_BERTH"])
{
equipment_weight -= [eqType requiredCargoSpace]; // all other cases;
}
}
if ([equipmentKey isEqualToString:@"EQ_CLOAKING_DEVICE"])
{
if ([self isCloaked]) [self setCloaked:NO];
}
}
if ([equipmentKey isEqualToString:@"EQ_CLOAKING_DEVICE"] && [_equipment containsObject:equipmentKey])
if (![equipmentKey hasSuffix:@"_DAMAGED"])
{
if ([self isCloaked]) [self setCloaked:NO];
NSString *damagedKey = [equipmentKey stringByAppendingString:@"_DAMAGED"];
if ([_equipment containsObject:damagedKey])
{
[_equipment removeObject:damagedKey]; // remove the damaged counterpart
equipment_weight -= [eqType requiredCargoSpace];
}
}
[_equipment removeObject:equipmentKey];
if (![equipmentKey hasSuffix:@"_DAMAGED"])
{
[_equipment removeObject:[equipmentKey stringByAppendingString:@"_DAMAGED"]];
}
if ([_equipment count] == 0) [self removeAllEquipment];
if (!isPlayer)
{