From 0d740bcfae2f38466e19b853142b22c86d11d47a Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 6 Nov 2013 16:58:09 -0800 Subject: [PATCH] Simpler Nasal for leg constraints. Thanks to Philosopher for the suggestion. --- src/Scripting/NasalPositioned.cxx | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx index 11ca31bf7..6e905beb7 100644 --- a/src/Scripting/NasalPositioned.cxx +++ b/src/Scripting/NasalPositioned.cxx @@ -2187,19 +2187,12 @@ static naRef f_leg_setSpeed(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "leg.setSpeed called on non-flightplan-leg object"); } - if (argc < 2) { + if ((argc < 2) || !naIsNum(args[0])) { naRuntimeError(c, "bad arguments to leg.setSpeed"); } RouteRestriction rr = routeRestrictionFromString(naStr_data(args[1])); - if (naIsNum(args[0])) { - leg->setSpeed(rr, args[0].num); - } else if (naIsString(args[0])) { - leg->setSpeed(rr, simgear::strutils::to_int(naStr_data(args[0]))); - } else { - naRuntimeError(c, "bad speed value for leg.setSpeed"); - } - + leg->setSpeed(rr, naNumValue(args[0]).num); return naNil(); } @@ -2211,18 +2204,12 @@ static naRef f_leg_setAltitude(naContext c, naRef me, int argc, naRef* args) naRuntimeError(c, "leg.setAltitude called on non-flightplan-leg object"); } - if (argc < 2) { + if ((argc < 2) || !naIsNum(args[0])) { naRuntimeError(c, "bad arguments to leg.setAltitude"); } RouteRestriction rr = routeRestrictionFromString(naStr_data(args[1])); - if (naIsNum(args[0])) { - leg->setAltitude(rr, args[0].num); - } else if (naIsString(args[0])) { - leg->setAltitude(rr, simgear::strutils::to_int(naStr_data(args[0]))); - } else { - naRuntimeError(c, "bad value for setAltitude"); - } + leg->setAltitude(rr, naNumValue(args[0]).num); return naNil(); } -- 2.39.5