fly/flightgear
1
0
Fork 0
Code Activity

Make the Nasal NaN check less aggressive - still SG_ALERT, but return nil instead of terminating the Nasal script completely.

Browse source
This commit is contained in:
James Turner 2011-01-14 20:04:20 +00:00
parent ed4a2369a4
commit 664817b0a7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Scripting/NasalSys.cxx
View file

@ -190,7 +190,7 @@ static naRef f_getprop(naContext c, naRef me, int argc, naRef* args)
double dv = p->getDoubleValue(); double dv = p->getDoubleValue();
if (osg::isNaN(dv)) { if (osg::isNaN(dv)) {
SG_LOG(SG_GENERAL, SG_ALERT, "Nasal getprop: property " << p->getPath() << " is NaN"); SG_LOG(SG_GENERAL, SG_ALERT, "Nasal getprop: property " << p->getPath() << " is NaN");
naRuntimeError(c, "getprop() would have read NaN"); return naNil();
} }
return naNum(dv); return naNum(dv);

2
src/Scripting/nasal-props.cxx
View file

@ -173,7 +173,7 @@ static naRef f_getValue(naContext c, naRef me, int argc, naRef* args)
double dv = (*node)->getDoubleValue(); double dv = (*node)->getDoubleValue();
if (osg::isNaN(dv)) { if (osg::isNaN(dv)) {
SG_LOG(SG_GENERAL, SG_ALERT, "Nasal getValue: property " << (*node)->getPath() << " is NaN"); SG_LOG(SG_GENERAL, SG_ALERT, "Nasal getValue: property " << (*node)->getPath() << " is NaN");
naRuntimeError(c, "props.getValue() would have read NaN"); return naNil();
} }
return naNum(dv); return naNum(dv);