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

Fix error in contract payment calculation (bug not in 1.77 release)

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5643 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Chris Morris 2013-02-28 18:33:04 +00:00
parent 0e543049bf
commit 0937cd6524
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/Entities/PlayerEntityContracts.m
View File

@ -291,8 +291,9 @@ static NSString * const kOOLogNoteShowShipyardModel = @"script.debug.note.showSh
NSString* contract_cargo_desc = [contract_info oo_stringForKey:CARGO_KEY_DESCRIPTION];
int dest = [contract_info oo_intForKey:CONTRACT_KEY_DESTINATION];
int dest_eta = [contract_info oo_doubleForKey:CONTRACT_KEY_ARRIVAL_TIME] - ship_clock;
int premium = 10 * [contract_info oo_floatForKey:CONTRACT_KEY_PREMIUM];
// no longer needed
// int premium = 10 * [contract_info oo_floatForKey:CONTRACT_KEY_PREMIUM];
int fee = 10 * [contract_info oo_floatForKey:CONTRACT_KEY_FEE];
int contract_cargo_type = [contract_info oo_intForKey:CARGO_KEY_TYPE];
@ -320,9 +321,12 @@ static NSString * const kOOLogNoteShowShipyardModel = @"script.debug.note.showSh
[shipCommodityData release];
shipCommodityData = [[NSArray arrayWithArray:manifest] retain];
// pay the premium and fee
credits += fee + premium;
// credits += fee + premium;
// not any more: all contracts initially awarded by JS, so fee
// is now all that needs to be paid - CIM
[result appendFormatLine:DESC(@"cargo-delivered-okay-@-@"), contract_cargo_desc, OOCredits(fee + premium)];
credits += fee;
[result appendFormatLine:DESC(@"cargo-delivered-okay-@-@"), contract_cargo_desc, OOCredits(fee)];
[contracts removeObjectAtIndex:i--];
// repute++
@ -342,9 +346,9 @@ static NSString * const kOOLogNoteShowShipyardModel = @"script.debug.note.showSh
[manifest replaceObjectAtIndex:contract_cargo_type withObject:commodityInfo];
[shipCommodityData release];
shipCommodityData = [[NSArray arrayWithArray:manifest] retain];
// pay the premium and fee
// pay the fee
int shortfall = 100 - percent_delivered;
int payment = percent_delivered * (fee + premium) / 100.0;
int payment = percent_delivered * (fee) / 100.0;
credits += payment;
[result appendFormatLine:DESC(@"cargo-delivered-short-@-@-d"), contract_cargo_desc, OOCredits(payment), shortfall];

9
src/Core/OOShipGroup.m
View File

@ -394,9 +394,12 @@ static id ShipGroupIterate(OOShipGroupEnumerator *enumerator);
return foundIt;
}
/* TODO post-1.78: just return _count from this function in deployment
* builds, as profiling indicates this is a noticeable contributor to
* ShipEntity::update time - CIM */
/* TODO post-1.78: profiling indicates this is a noticeable
* contributor to ShipEntity::update time. Consider optimisation: may
* be possible to return _count if invalidation of weakref and group
* removal in ShipEntity::dealloc keeps the data consistent anyway -
* CIM */
- (NSUInteger) count
{
NSEnumerator *memberEnum = nil;