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

Fix a couple of errors in new events

Browse Source
This commit is contained in:
cim 2013-06-23 10:19:53 +01:00
parent c571511854
commit 0ff36ce8fd
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Entities/DockEntity.m
View File

@ -112,6 +112,7 @@ MA 02110-1301, USA.
{ {
[station sendExpandedMessage:@"[station-docking-clearance-abort-cancelled]" toShip:player]; [station sendExpandedMessage:@"[station-docking-clearance-abort-cancelled]" toShip:player];
[player setDockingClearanceStatus:DOCKING_CLEARANCE_STATUS_NONE]; [player setDockingClearanceStatus:DOCKING_CLEARANCE_STATUS_NONE];
[player doScriptEvent:OOJSID("stationWithdrewDockingClearance")];
} }
else else
{ {

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

@ -8804,7 +8804,7 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
{ {
[self removeDefenseTarget:target]; [self removeDefenseTarget:target];
[shipAI message:@"DEFENSE_TARGET_DESTROYED"]; [shipAI message:@"DEFENSE_TARGET_DESTROYED"];
[self doScriptEvent:OOJSID("shipDefenseTargetDestroyed") withArgument:target]; [self doScriptEvent:OOJSID("defenseTargetDestroyed") withArgument:target];
} }
} }

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

@ -1887,6 +1887,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, Vector coords, f
} }
[escort_ship release]; [escort_ship release];
return escort_ship;
} }
@ -2230,6 +2231,7 @@ NSDictionary *OOMakeDockingInstructions(StationEntity *station, Vector coords, f
{ {
soa += [sub countOfShipsInDockingQueue]; soa += [sub countOfShipsInDockingQueue];
} }
soa += [_shipsOnHold count];
return soa; return soa;
} }