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

More annoying casts to placate the stupidity of gnu-gcc.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1652 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2008-05-23 21:45:27 +00:00
parent 7a574a8b3e
commit 332dfc6a1b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -715,7 +715,7 @@ static NSTimeInterval time_last_frame;
if (!ident_engaged) if (!ident_engaged)
{ {
if (missile_status !=MISSILE_STATUS_SAFE) if (missile_status !=MISSILE_STATUS_SAFE)
[UNIVERSE addMessage:[NSString stringWithFormat:@"%@ %@", DESC(@"missile-safe"), (primaryTarget != NO_TARGET && [self hasEquipmentItem:@"EQ_SCANNER_SHOW_MISSILE_TARGET"])? DESC(@"ident-off") : @""] forCount:2.5]; [UNIVERSE addMessage:[NSString stringWithFormat:@"%@ %@", DESC(@"missile-safe"), (primaryTarget != NO_TARGET && [self hasEquipmentItem:@"EQ_SCANNER_SHOW_MISSILE_TARGET"])? DESC(@"ident-off") : (NSString *)@""] forCount:2.5];
primaryTarget = NO_TARGET; primaryTarget = NO_TARGET;
[self safeAllMissiles]; [self safeAllMissiles];
[self playMissileSafe]; [self playMissileSafe];

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

@ -4873,7 +4873,7 @@ BOOL class_masslocks(int some_class)
{ {
ShipEntity* target = [UNIVERSE entityForUniversalID:primaryTarget]; ShipEntity* target = [UNIVERSE entityForUniversalID:primaryTarget];
primaryTarget = NO_TARGET; primaryTarget = NO_TARGET;
[self doScriptEvent:@"shipLostTarget" withArgument: (target && target->isShip) ? target : nil]; [self doScriptEvent:@"shipLostTarget" withArgument:(target && target->isShip) ? (id)target : nil];
[shipAI reactToMessage:@"TARGET_LOST"]; [shipAI reactToMessage:@"TARGET_LOST"];
} }
} }