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

Entities designated as excepted for collision with the player will now not limit the torus speed variability. Thanks to Milo for this contribution.

Browse Source
This commit is contained in:
AnotherCommander 2020-07-11 11:30:57 +02:00
parent 91ad8830fa
commit 07e2ddb81c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/contributors.txt
View File

@ -32,6 +32,7 @@ Olli Krienke (Svengali)
Lazygun
Dave MacLachlan (Jester)
MaddTheSane
Milo
Chris Morris (cim)
Steve Murphy (Capt. Murphy)
Norbert Nagy (Norby)

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

@ -3170,7 +3170,7 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
if (EXPECT_NOT(needHyperspeedNearest))
{
// not visual effects, waypoints, ships, etc.
if (scannedEntity != self && [scannedEntity canCollide])
if (scannedEntity != self && [scannedEntity canCollide] && (![scannedEntity isShip] || ![self collisionExceptedFor:(ShipEntity *) scannedEntity]))
{
hsnDistance = sqrt(scannedEntity->zero_distance)-[scannedEntity collisionRadius];
needHyperspeedNearest = NO;