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

Fixed broken player.ship in r2980; energy bomb compensation now only kicks in if EQ_ENERGY_BOMB is not available, making complete restoration a simple equipment.plist change.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2981 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-01-19 22:57:08 +00:00
parent 22546a3bdd
commit 6948b2130a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,14 +183,13 @@ static GLfloat calcFuelChargeRate (ShipEntity *player, ShipEntity *base)
if (ship != nil)
{
NSArray *playerships = [[OOShipRegistry sharedRegistry] playerShipKeys];
const size_t count = [playerships count];
int i;
OOUInteger i, count = [playerships count];
for (i = 0; i < count; ++i)
{
ShipEntity *calc = [UNIVERSE newShipWithName:[playerships objectAtIndex:i]];
GLfloat rate = calcFuelChargeRate (calc, ship);
printf ("%32s: %6.2f\n", [[playerships objectAtIndex:i] cString], rate);
GLfloat rate = calcFuelChargeRate(calc, ship);
OOLog(@"temp.calcFuelChargeRate", @"%32s: %6.2f", [[playerships objectAtIndex:i] UTF8String], rate);
[calc release];
}
[ship release];
@ -678,7 +677,7 @@ static GLfloat calcFuelChargeRate (ShipEntity *player, ShipEntity *base)
award until we've handled missiles later on, though.
*/
BOOL energyBombCompensation = NO;
if (!strict && [equipment oo_boolForKey:@"EQ_ENERGY_BOMB"])
if ([equipment oo_boolForKey:@"EQ_ENERGY_BOMB"] && [OOEquipmentType equipmentTypeWithIdentifier:@"EQ_ENERGY_BOMB"] == nil)
{
energyBombCompensation = YES;
[equipment removeObjectForKey:@"EQ_ENERGY_BOMB"];
@ -905,8 +904,12 @@ static GLfloat calcFuelChargeRate (ShipEntity *player, ShipEntity *base)
[NSException raise:NSInternalInconsistencyException format:@"%s: expected only one PlayerEntity to exist at a time.", __FUNCTION__];
}
self = [super init];
/* NOTE: this is bad form, in that it assumes super init... will return
self, but necessary in order to have a valid "shared player" if
anything happens that requires the scripting engine to be set up.
*/
sSharedPlayer = self;
[super initWithDictionary:[NSDictionary dictionary]];
compassMode = COMPASS_MODE_BASIC;

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

@ -141,7 +141,7 @@ static NSString * const kOOLogEntityBehaviourChanged = @"entity.behaviour.change
// Designated initializer
- (id) initWithDictionary:(NSDictionary *) dict
{
if (dict == nil && ![self isKindOfClass:[PlayerEntity class]])
if (dict == nil)
{
// Is there any reason we should allow nil dictionary here? I think not. --Ahruman 2008-04-27
// Yes, the player ship uses -init. Any others? --Ahruman 2008-04-28