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

Hopefully fixed the long distance targeting bug for good this time. The primary target's distance from player is now checked on a per-frame basis and the target is released if the distance is higher than maximum scanner range.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4558 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2011-06-06 09:44:38 +00:00
parent 7356224196
commit 1e566c3eea
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2068,6 +2068,14 @@ static bool minShieldLevelPercentageInitialised = false;
}
[hud setScannerZoom:z1];
}
// scanner sanity check - lose any targets further than maximum scanner range
ShipEntity *primeTarget = [UNIVERSE entityForUniversalID:primaryTarget];
if (primeTarget && distance2([primeTarget position], [self position]) > SCANNER_MAX_RANGE2 && !autopilot_engaged)
{
[UNIVERSE addMessage:DESC(@"target-lost") forCount:3.0];
[self removeTarget:primeTarget];
}
// update subentities
UPDATE_STAGE(@"updating subentities");

6
src/Core/Scripting/EntityOOJavaScriptExtensions.m
View File

@ -150,12 +150,6 @@ MA 02110-1301, USA.
if (target != nil)
{
[me addTarget:target];
// Out of player's scanner range? Lose target - Nikos 20110415
if ([me isPlayer] && distance2([me position], [target position]) > SCANNER_MAX_RANGE2)
{
[UNIVERSE addMessage:DESC(@"target-lost") forCount:3.0];
[me removeTarget:target];
}
}
else [me removeTarget:[me primaryTarget]];
}