X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalPositioned.cxx;h=25d28bb40c1c549c1e168eefddfc0c383d14b9ad;hb=ce09c320d32728dd9c5eb0d6b4ab9f4683242cbc;hp=24f5564ba3d462ba9a51bde97d6a855748b40d72;hpb=afcdbd3158503773644aa07dd86cd92d67946bd4;p=flightgear.git diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx index 24f5564ba..25d28bb40 100644 --- a/src/Scripting/NasalPositioned.cxx +++ b/src/Scripting/NasalPositioned.cxx @@ -28,6 +28,7 @@ #include #include +#include // for boost::tie #include #include @@ -36,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -72,6 +73,7 @@ naGhostType NavaidGhostType = { positionedGhostDestroy, "navaid", navaidGhostGet static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef* out); naGhostType RunwayGhostType = { positionedGhostDestroy, "runway", runwayGhostGetMember, 0 }; +naGhostType HelipadGhostType = { positionedGhostDestroy, "helipad", runwayGhostGetMember, 0 }; naGhostType TaxiwayGhostType = { positionedGhostDestroy, "taxiway", runwayGhostGetMember, 0 }; static const char* fixGhostGetMember(naContext c, void* g, naRef field, naRef* out); @@ -288,6 +290,16 @@ naRef ghostForRunway(naContext c, const FGRunway* r) return naNewGhost2(c, &RunwayGhostType, (void*) r); } +naRef ghostForHelipad(naContext c, const FGHelipad* r) +{ + if (!r) { + return naNil(); + } + + FGPositioned::get(r); // take a ref + return naNewGhost2(c, &HelipadGhostType, (void*) r); +} + naRef ghostForTaxiway(naContext c, const FGTaxiway* r) { if (!r) { @@ -314,7 +326,7 @@ naRef ghostForWaypt(naContext c, const Waypt* wpt) if (!wpt) { return naNil(); } - + Waypt::get(wpt); // take a ref return naNewGhost2(c, &WayptGhostType, (void*) wpt); } @@ -367,16 +379,24 @@ static const char* airportGhostGetMember(naContext c, void* g, naRef field, naRe double minLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft"); for(unsigned int r=0; rnumRunways(); ++r) { FGRunway* rwy(apt->getRunwayByIndex(r)); - - // ignore unusably short runways + // ignore unusably short runways if (rwy->lengthFt() < minLengthFt) { continue; } - naRef rwyid = stringToNasal(c, rwy->ident()); naRef rwydata = ghostForRunway(c, rwy); naHash_set(*out, rwyid, rwydata); } + } else if (!strcmp(fieldName, "helipads")) { + *out = naNewHash(c); + + for(unsigned int r=0; rnumHelipads(); ++r) { + FGHelipad* hp(apt->getHelipadByIndex(r)); + + naRef rwyid = stringToNasal(c, hp->ident()); + naRef rwydata = ghostForHelipad(c, hp); + naHash_set(*out, rwyid, rwydata); + } } else if (!strcmp(fieldName, "taxiways")) { *out = naNewVector(c); @@ -395,11 +415,11 @@ static const char* airportGhostGetMember(naContext c, void* g, naRef field, naRe static const char* waypointCommonGetMember(naContext c, Waypt* wpt, const char* fieldName, naRef* out) { - if (!strcmp(fieldName, "wp_name")) *out = stringToNasal(c, wpt->ident()); + if (!strcmp(fieldName, "wp_name") || !strcmp(fieldName, "id")) *out = stringToNasal(c, wpt->ident()); else if (!strcmp(fieldName, "wp_type")) *out = stringToNasal(c, wpt->type()); else if (!strcmp(fieldName, "wp_role")) *out = wayptFlagToNasal(c, wpt->flags()); - else if (!strcmp(fieldName, "wp_lat")) *out = naNum(wpt->position().getLatitudeDeg()); - else if (!strcmp(fieldName, "wp_lon")) *out = naNum(wpt->position().getLongitudeDeg()); + else if (!strcmp(fieldName, "wp_lat") || !strcmp(fieldName, "lat")) *out = naNum(wpt->position().getLatitudeDeg()); + else if (!strcmp(fieldName, "wp_lon") || !strcmp(fieldName, "lon")) *out = naNum(wpt->position().getLongitudeDeg()); else if (!strcmp(fieldName, "wp_parent_name")) { Procedure* proc = dynamic_cast(wpt->owner()); *out = proc ? stringToNasal(c, proc->ident()) : naNil(); @@ -442,7 +462,7 @@ static const char* wayptGhostGetMember(naContext c, void* g, naRef field, naRef* static RouteRestriction routeRestrictionFromString(const char* s) { - string u(s); + std::string u(s); boost::to_lower(u); if (u == "computed") return RESTRICT_COMPUTED; if (u == "at") return RESTRICT_AT; @@ -477,6 +497,7 @@ static const char* legGhostGetMember(naContext c, void* g, naRef field, naRef* o if (!strcmp(fieldName, "parents")) { *out = naNewVector(c); naVec_append(*out, fpLegPrototype); + naVec_append(*out, waypointPrototype); } else if (!strcmp(fieldName, "index")) { *out = naNum(leg->index()); } else if (!strcmp(fieldName, "alt_cstr")) { @@ -569,6 +590,11 @@ static void flightplanGhostSetMember(naContext c, void* g, naRef field, naRef va return; } + if (naIsNil(value)) { + fp->setDeparture(static_cast(NULL)); + return; + } + naRuntimeError(c, "bad argument type setting departure"); } else if (!strcmp(fieldName, "destination")) { FGAirport* apt = airportGhost(value); @@ -591,7 +617,7 @@ static void flightplanGhostSetMember(naContext c, void* g, naRef field, naRef va return; } - naRuntimeError(c, "bad argument type setting departure"); + naRuntimeError(c, "bad argument type setting departure runway"); } else if (!strcmp(fieldName, "destination_runway")) { FGRunway* rwy = runwayGhost(value); if (rwy){ @@ -599,7 +625,7 @@ static void flightplanGhostSetMember(naContext c, void* g, naRef field, naRef va return; } - naRuntimeError(c, "bad argument type setting departure"); + naRuntimeError(c, "bad argument type setting destination runway"); } else if (!strcmp(fieldName, "sid")) { Procedure* proc = procedureGhost(value); if (proc && (proc->type() == PROCEDURE_SID)) { @@ -708,7 +734,7 @@ static const char* procedureGhostGetMember(naContext c, void* g, naRef field, na ArrivalDeparture* ad = static_cast(proc); *out = naNewVector(c); - BOOST_FOREACH(string id, ad->transitionIdents()) { + BOOST_FOREACH(std::string id, ad->transitionIdents()) { naVec_append(*out, stringToNasal(c, id)); } } else { @@ -734,7 +760,9 @@ static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef FGRunway* rwy = (FGRunway*) g; if (!strcmp(fieldName, "threshold")) *out = naNum(rwy->displacedThresholdM()); else if (!strcmp(fieldName, "stopway")) *out = naNum(rwy->stopwayM()); - else if (!strcmp(fieldName, "ils_frequency_mhz")) { + else if (!strcmp(fieldName, "reciprocal")) { + *out = ghostForRunway(c, rwy->reciprocalRunway()); + } else if (!strcmp(fieldName, "ils_frequency_mhz")) { *out = rwy->ILS() ? naNum(rwy->ILS()->get_freq() / 100.0) : naNil(); } else if (!strcmp(fieldName, "ils")) { *out = ghostForNavaid(c, rwy->ILS()); @@ -961,49 +989,6 @@ static naRef f_geodinfo(naContext c, naRef me, int argc, naRef* args) } -class AirportInfoFilter : public FGAirport::AirportFilter -{ -public: - AirportInfoFilter() : type(FGPositioned::AIRPORT) { - minRunwayLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft", 0.0); - } - - bool fromArg(naRef arg) - { - const char *s = naStr_data(arg); - if(!strcmp(s, "airport")) type = FGPositioned::AIRPORT; - else if(!strcmp(s, "seaport")) type = FGPositioned::SEAPORT; - else if(!strcmp(s, "heliport")) type = FGPositioned::HELIPORT; - else - return false; - - return true; - } - - virtual FGPositioned::Type minType() const { - return type; - } - - virtual FGPositioned::Type maxType() const { - return type; - } - - virtual bool pass(FGPositioned* aPos) const - { - FGAirport* apt = (FGAirport*) aPos; - if ((apt->type() == FGPositioned::AIRPORT) && - !apt->hasHardRunwayOfLengthFt(minRunwayLengthFt)) - { - return false; - } - - return true; - } - - FGPositioned::Type type; - double minRunwayLengthFt; -}; - // Returns data hash for particular or nearest airport of a , or nil // on error. // @@ -1024,12 +1009,12 @@ static naRef f_airportinfo(naContext c, naRef me, int argc, naRef* args) double maxRange = 10000.0; // expose this? or pick a smaller value? - AirportInfoFilter filter; // defaults to airports only + FGAirport::TypeRunwayFilter filter; // defaults to airports only if(argc == 0) { // fall through and use AIRPORT } else if(argc == 1 && naIsString(args[0])) { - if (filter.fromArg(args[0])) { + if (filter.fromTypeString(naStr_data(args[0]))) { // done! } else { // user provided an , hopefully @@ -1064,15 +1049,15 @@ static naRef f_findAirportsWithinRange(naContext c, naRef me, int argc, naRef* a naRuntimeError(c, "findAirportsWithinRange expected range (in nm) as arg %d", argOffset); } - AirportInfoFilter filter; // defaults to airports only + FGAirport::TypeRunwayFilter filter; // defaults to airports only double rangeNm = args[argOffset++].num; if (argOffset < argc) { - filter.fromArg(args[argOffset++]); + filter.fromTypeString(naStr_data(args[argOffset++])); } naRef r = naNewVector(c); - FGPositioned::List apts = FGPositioned::findWithinRange(pos, rangeNm, &filter); + FGPositionedList apts = FGPositioned::findWithinRange(pos, rangeNm, &filter); FGPositioned::sortByRange(apts, pos); BOOST_FOREACH(FGPositionedRef a, apts) { @@ -1090,15 +1075,15 @@ static naRef f_findAirportsByICAO(naContext c, naRef me, int argc, naRef* args) } int argOffset = 0; - string prefix(naStr_data(args[argOffset++])); - AirportInfoFilter filter; // defaults to airports only + std::string prefix(naStr_data(args[argOffset++])); + FGAirport::TypeRunwayFilter filter; // defaults to airports only if (argOffset < argc) { - filter.fromArg(args[argOffset++]); + filter.fromTypeString(naStr_data(args[argOffset++])); } naRef r = naNewVector(c); - FGPositioned::List apts = FGPositioned::findAllWithIdent(prefix, &filter, false); + FGPositionedList apts = FGPositioned::findAllWithIdent(prefix, &filter, false); BOOST_FOREACH(FGPositionedRef a, apts) { FGAirport* apt = (FGAirport*) a.get(); @@ -1133,7 +1118,11 @@ static naRef f_airport_comms(naContext c, naRef me, int argc, naRef* args) naRef comms = naNewVector(c); // if we have an explicit type, return a simple vector of frequencies - if (argc > 0 && naIsScalar(args[0])) { + if (argc > 0 && !naIsString(args[0])) { + naRuntimeError(c, "airport.comms argument must be a frequency type name"); + } + + if (argc > 0) { std::string commName = naStr_data(args[0]); FGPositioned::Type commType = FGPositioned::typeFromName(commName); @@ -1159,38 +1148,36 @@ static naRef f_airport_runway(naContext c, naRef me, int argc, naRef* args) if (!apt) { naRuntimeError(c, "airport.runway called on non-airport object"); } - + if ((argc < 1) || !naIsString(args[0])) { naRuntimeError(c, "airport.runway expects a runway ident argument"); } - + std::string ident(naStr_data(args[0])); boost::to_upper(ident); - if (!apt->hasRunwayWithIdent(ident)) { - return naNil(); + + if (apt->hasRunwayWithIdent(ident)) { + return ghostForRunway(c, apt->getRunwayByIdent(ident)); + } else if (apt->hasHelipadWithIdent(ident)) { + return ghostForHelipad(c, apt->getHelipadByIdent(ident)); } - - return ghostForRunway(c, apt->getRunwayByIdent(ident)); + return naNil(); } -static naRef f_airport_taxiway(naContext c, naRef me, int argc, naRef* args) +static naRef f_airport_runwaysWithoutReciprocals(naContext c, naRef me, int argc, naRef* args) { FGAirport* apt = airportGhost(me); if (!apt) { - naRuntimeError(c, "airport.taxiway called on non-airport object"); + naRuntimeError(c, "airport.runwaysWithoutReciprocals called on non-airport object"); } - - if ((argc < 1) || !naIsString(args[0])) { - naRuntimeError(c, "airport.taxiway expects a taxiway ident argument"); - } - - naRef taxiways = naNewVector(c); - - for (unsigned int i = 0; i < apt->numTaxiways(); i++) { - naVec_append(taxiways, ghostForTaxiway(c, apt->getTaxiwayByIndex(i))); + + FGRunwayList rwylist(apt->getRunwaysWithoutReciprocals()); + naRef runways = naNewVector(c); + for (unsigned int r=0; rgetRunwayByIdent(rwy->ident()))); } - - return taxiways; + return runways; } static naRef f_airport_sids(naContext c, naRef me, int argc, naRef* args) @@ -1377,7 +1364,7 @@ static naRef f_airport_getSid(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "airport.getSid passed invalid argument"); } - string ident = naStr_data(args[0]); + std::string ident = naStr_data(args[0]); return ghostForProcedure(c, apt->findSIDWithIdent(ident)); } @@ -1392,7 +1379,7 @@ static naRef f_airport_getStar(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "airport.getStar passed invalid argument"); } - string ident = naStr_data(args[0]); + std::string ident = naStr_data(args[0]); return ghostForProcedure(c, apt->findSTARWithIdent(ident)); } @@ -1407,10 +1394,25 @@ static naRef f_airport_getApproach(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "airport.getIAP passed invalid argument"); } - string ident = naStr_data(args[0]); + std::string ident = naStr_data(args[0]); return ghostForProcedure(c, apt->findApproachWithIdent(ident)); } +static naRef f_airport_findBestRunway(naContext c, naRef me, int argc, naRef* args) +{ + FGAirport* apt = airportGhost(me); + if (!apt) { + naRuntimeError(c, "findBestRunway called on non-airport object"); + } + + SGGeod pos; + if (!geodFromArgs(args, 0, argc, pos)) { + naRuntimeError(c, "findBestRunway must be passed a position"); + } + + return ghostForRunway(c, apt->findBestRunwayForPos(pos)); +} + static naRef f_airport_toString(naContext c, naRef me, int argc, naRef* args) { FGAirport* apt = airportGhost(me); @@ -1506,7 +1508,7 @@ static naRef f_findNavaidsWithinRange(naContext c, naRef me, int argc, naRef* ar naRef r = naNewVector(c); FGNavList::TypeFilter filter(type); - FGPositioned::List navs = FGPositioned::findWithinRange(pos, rangeNm, &filter); + FGPositionedList navs = FGPositioned::findWithinRange(pos, rangeNm, &filter); FGPositioned::sortByRange(navs, pos); BOOST_FOREACH(FGPositionedRef a, navs) { @@ -1581,7 +1583,7 @@ static naRef f_findNavaidsByIdent(naContext c, naRef me, int argc, naRef* args) } FGPositioned::Type type = FGPositioned::INVALID; - string ident = naStr_data(args[argOffset++]); + std::string ident = naStr_data(args[argOffset++]); if (argOffset < argc) { type = FGPositioned::typeFromName(naStr_data(args[argOffset])); } @@ -1607,11 +1609,11 @@ static naRef f_findFixesByIdent(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "findFixesByIdent expectes ident string as arg %d", argOffset); } - string ident(naStr_data(args[argOffset])); + std::string ident(naStr_data(args[argOffset])); naRef r = naNewVector(c); FGPositioned::TypeFilter filter(FGPositioned::FIX); - FGPositioned::List fixes = FGPositioned::findAllWithIdent(ident, &filter); + FGPositionedList fixes = FGPositioned::findAllWithIdent(ident, &filter); FGPositioned::sortByRange(fixes, pos); BOOST_FOREACH(FGPositionedRef f, fixes) { @@ -1743,13 +1745,11 @@ public: _plan(fp), _instance(ins) { - SG_LOG(SG_NASAL, SG_INFO, "created Nasal delegate for " << fp); _gcSaveKey = _nasal->gcSave(ins); } virtual ~NasalFPDelegate() { - SG_LOG(SG_NASAL, SG_INFO, "destroying Nasal delegate for " << _plan); _nasal->gcRelease(_gcSaveKey); } @@ -1772,13 +1772,22 @@ public: { callDelegateMethod("currentWaypointChanged"); } + + virtual void cleared() + { + callDelegateMethod("cleared"); + } + + virtual void endOfFlightPlan() + { + callDelegateMethod("endOfFlightPlan"); + } private: void callDelegateMethod(const char* method) { naRef f; - naMember_cget(_nasal->context(), _instance, method, &f); - if (naIsNil(f)) { + if (naMember_cget(_nasal->context(), _instance, method, &f) == 0) { return; // no method on the delegate } @@ -1909,12 +1918,16 @@ static naRef f_createWP(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "createWP: no identifier supplied"); } - string ident = naStr_data(args[argOffset++]); + std::string ident = naStr_data(args[argOffset++]); WayptRef wpt = new BasicWaypt(pos, ident, NULL); // set waypt flags - approach, departure, pseudo, etc if (argc > argOffset) { WayptFlag f = wayptFlagFromString(naStr_data(args[argOffset++])); + if (f == 0) { + naRuntimeError(c, "createWP: bad waypoint role"); + } + wpt->setFlag(f); } @@ -1942,6 +1955,9 @@ static naRef f_createWPFrom(naContext c, naRef me, int argc, naRef* args) // set waypt flags - approach, departure, pseudo, etc if (argc > 1) { WayptFlag f = wayptFlagFromString(naStr_data(args[1])); + if (f == 0) { + naRuntimeError(c, "createWPFrom: bad waypoint role"); + } wpt->setFlag(f); } @@ -2111,6 +2127,10 @@ static naRef f_flightplan_clearWPType(naContext c, naRef me, int argc, naRef* ar } WayptFlag flag = wayptFlagFromString(naStr_data(args[0])); + if (flag == 0) { + naRuntimeError(c, "clearWPType: bad waypoint role"); + } + fp->clearWayptsWithFlag(flag); return naNil(); } @@ -2125,6 +2145,41 @@ static naRef f_flightplan_clone(naContext c, naRef me, int argc, naRef* args) return ghostForFlightPlan(c, fp->clone()); } +static naRef f_flightplan_pathGeod(naContext c, naRef me, int argc, naRef* args) +{ + FlightPlan* fp = flightplanGhost(me); + if (!fp) { + naRuntimeError(c, "flightplan.clone called on non-flightplan object"); + } + + if ((argc < 1) || !naIsNum(args[0])) { + naRuntimeError(c, "bad argument to flightplan.pathGeod"); + } + + if ((argc > 1) && !naIsNum(args[1])) { + naRuntimeError(c, "bad argument to flightplan.pathGeod"); + } + + int index = (int) args[0].num; + double offset = (argc > 1) ? args[1].num : 0.0; + naRef result = naNewHash(c); + SGGeod g = fp->pointAlongRoute(index, offset); + hashset(c, result, "lat", naNum(g.getLatitudeDeg())); + hashset(c, result, "lon", naNum(g.getLongitudeDeg())); + return result; +} + +static naRef f_flightplan_finish(naContext c, naRef me, int argc, naRef* args) +{ + FlightPlan* fp = flightplanGhost(me); + if (!fp) { + naRuntimeError(c, "flightplan.finish called on non-flightplan object"); + } + + fp->finish(); + return naNil(); +} + static naRef f_leg_setSpeed(naContext c, naRef me, int argc, naRef* args) { FlightPlan::Leg* leg = fpLegGhost(me); @@ -2179,6 +2234,26 @@ static naRef f_leg_path(naContext c, naRef me, int argc, naRef* args) return result; } +static naRef f_leg_courseAndDistanceFrom(naContext c, naRef me, int argc, naRef* args) +{ + FlightPlan::Leg* leg = fpLegGhost(me); + if (!leg) { + naRuntimeError(c, "leg.courseAndDistanceFrom called on non-flightplan-leg object"); + } + + SGGeod pos; + geodFromArgs(args, 0, argc, pos); + + double courseDeg; + double distanceM; + boost::tie(courseDeg, distanceM) = leg->waypoint()->courseAndDistanceFrom(pos); + + naRef result = naNewVector(c); + naVec_append(result, naNum(courseDeg)); + naVec_append(result, naNum(distanceM * SG_METER_TO_NM)); + return result; +} + static naRef f_waypoint_navaid(naContext c, naRef me, int argc, naRef* args) { flightgear::Waypt* w = wayptGhost(me); @@ -2332,13 +2407,14 @@ static struct { const char* name; naCFunction func; } funcs[] = { }; -naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave) +naRef initNasalPositioned(naRef globals, naContext c) { airportPrototype = naNewHash(c); - hashset(c, gcSave, "airportProto", airportPrototype); + naSave(c, airportPrototype); hashset(c, airportPrototype, "runway", naNewFunc(c, naNewCCode(c, f_airport_runway))); - hashset(c, airportPrototype, "taxiway", naNewFunc(c, naNewCCode(c, f_airport_taxiway))); + hashset(c, airportPrototype, "runwaysWithoutReciprocals", naNewFunc(c, naNewCCode(c, f_airport_runwaysWithoutReciprocals))); + hashset(c, airportPrototype, "helipad", naNewFunc(c, naNewCCode(c, f_airport_runway))); hashset(c, airportPrototype, "tower", naNewFunc(c, naNewCCode(c, f_airport_tower))); hashset(c, airportPrototype, "comms", naNewFunc(c, naNewCCode(c, f_airport_comms))); hashset(c, airportPrototype, "sids", naNewFunc(c, naNewCCode(c, f_airport_sids))); @@ -2348,10 +2424,11 @@ naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave) hashset(c, airportPrototype, "getSid", naNewFunc(c, naNewCCode(c, f_airport_getSid))); hashset(c, airportPrototype, "getStar", naNewFunc(c, naNewCCode(c, f_airport_getStar))); hashset(c, airportPrototype, "getIAP", naNewFunc(c, naNewCCode(c, f_airport_getApproach))); + hashset(c, airportPrototype, "findBestRunwayForPos", naNewFunc(c, naNewCCode(c, f_airport_findBestRunway))); hashset(c, airportPrototype, "tostring", naNewFunc(c, naNewCCode(c, f_airport_toString))); flightplanPrototype = naNewHash(c); - hashset(c, gcSave, "flightplanProto", flightplanPrototype); + naSave(c, flightplanPrototype); hashset(c, flightplanPrototype, "getWP", naNewFunc(c, naNewCCode(c, f_flightplan_getWP))); hashset(c, flightplanPrototype, "currentWP", naNewFunc(c, naNewCCode(c, f_flightplan_currentWP))); @@ -2365,24 +2442,27 @@ naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave) hashset(c, flightplanPrototype, "cleanPlan", naNewFunc(c, naNewCCode(c, f_flightplan_clearPlan))); hashset(c, flightplanPrototype, "clearWPType", naNewFunc(c, naNewCCode(c, f_flightplan_clearWPType))); hashset(c, flightplanPrototype, "clone", naNewFunc(c, naNewCCode(c, f_flightplan_clone))); - + hashset(c, flightplanPrototype, "pathGeod", naNewFunc(c, naNewCCode(c, f_flightplan_pathGeod))); + hashset(c, flightplanPrototype, "finish", naNewFunc(c, naNewCCode(c, f_flightplan_finish))); + waypointPrototype = naNewHash(c); - hashset(c, gcSave, "wayptProto", waypointPrototype); + naSave(c, waypointPrototype); hashset(c, waypointPrototype, "navaid", naNewFunc(c, naNewCCode(c, f_waypoint_navaid))); hashset(c, waypointPrototype, "runway", naNewFunc(c, naNewCCode(c, f_waypoint_runway))); hashset(c, waypointPrototype, "airport", naNewFunc(c, naNewCCode(c, f_waypoint_airport))); procedurePrototype = naNewHash(c); - hashset(c, gcSave, "procedureProto", procedurePrototype); + naSave(c, procedurePrototype); hashset(c, procedurePrototype, "transition", naNewFunc(c, naNewCCode(c, f_procedure_transition))); hashset(c, procedurePrototype, "route", naNewFunc(c, naNewCCode(c, f_procedure_route))); fpLegPrototype = naNewHash(c); - hashset(c, gcSave, "fpLegProto", fpLegPrototype); + naSave(c, fpLegPrototype); hashset(c, fpLegPrototype, "setSpeed", naNewFunc(c, naNewCCode(c, f_leg_setSpeed))); hashset(c, fpLegPrototype, "setAltitude", naNewFunc(c, naNewCCode(c, f_leg_setAltitude))); hashset(c, fpLegPrototype, "path", naNewFunc(c, naNewCCode(c, f_leg_path))); + hashset(c, fpLegPrototype, "courseAndDistanceFrom", naNewFunc(c, naNewCCode(c, f_leg_courseAndDistanceFrom))); for(int i=0; funcs[i].name; i++) { hashset(c, globals, funcs[i].name,