From b0de9d5a1179b2114499bf64d4c5ba23cd1f4125 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Mon, 11 Sep 2017 23:30:53 +0100 Subject: [PATCH] Make Nasal Flightplan.indexOfWP work on Legs --- src/Scripting/NasalPositioned.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx index 95032c388..6a564ee50 100644 --- a/src/Scripting/NasalPositioned.cxx +++ b/src/Scripting/NasalPositioned.cxx @@ -2445,6 +2445,15 @@ static naRef f_flightplan_indexOfWp(naContext c, naRef me, int argc, naRef* args return naNum(fp->findWayptIndex(positioned)); } + FlightPlan::Leg* leg = fpLegGhost(args[0]); + if (leg) { + if (leg->owner() == fp) { + return naNum(leg->index()); + } + + naRuntimeError(c, "flightplan.indexOfWP called on leg from different flightplan"); + } + SGGeod pos; int argOffset = geodFromArgs(args, 0, argc, pos); if (argOffset > 0) {