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

Hopefully resolved bug that caused ships with subentities exploding inside closed structures. Test will be required to confirm that I have not broken anything else.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2290 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2009-08-16 17:45:20 +00:00
parent 0a97d1b193
commit d2eb33aee8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1069,10 +1069,10 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
Octree *prime_octree = prime->octree;
Octree *other_octree = other->octree;
Vector other_position = [prime absolutePositionForSubentity];
Triangle other_ijk = [prime absoluteIJKForSubentity];
Vector prime_position = [other absolutePositionForSubentity];
Triangle prime_ijk = [other absoluteIJKForSubentity];
Vector prime_position = [prime absolutePositionForSubentity];
Triangle prime_ijk = [prime absoluteIJKForSubentity];
Vector other_position = [other absolutePositionForSubentity];
Triangle other_ijk = [other absoluteIJKForSubentity];
Vector relative_position_of_other = resolveVectorInIJK(vector_between(prime_position, other_position), prime_ijk);
Triangle relative_ijk_of_other;