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

Fix errors when subentities try to launch escape pods

Browse Source 
(They don't have crew, so they need has_escape_pod >= 2 to actually
launch anything even now)
This commit is contained in:
cim 2014-07-24 16:32:56 +01:00
parent a682b933fc
commit 33dfb0ef5c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/CHANGELOG.TXT
View File

@ -41,6 +41,7 @@ Changes between Oolite 1.80 and Oolite 1.80.1:
* Fixed key 5 switching to status screen when used during save game * Fixed key 5 switching to status screen when used during save game
filename entry. filename entry.
* Fix Linux uninstall script error handling * Fix Linux uninstall script error handling
* Fix errors with escape pod launch from subentities
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

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

@ -11657,7 +11657,7 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
Quaternion jetto_orientation = kIdentityQuaternion; Quaternion jetto_orientation = kIdentityQuaternion;
Vector vel, v_eject, v_eject_normal; Vector vel, v_eject, v_eject_normal;
HPVector rpos = position; HPVector rpos = [self absolutePositionForSubentity];
double jetto_roll = 0; double jetto_roll = 0;
double jetto_pitch = 0; double jetto_pitch = 0;
@ -12415,6 +12415,11 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
} }
} }
} }
else if (EXPECT([self isSubEntity]))
{
// may still have launched passenger pods even if no crew
[self removeEquipmentItem:@"EQ_ESCAPE_POD"];
}
else else
{ {
// this shouldn't happen any more! // this shouldn't happen any more!