fly/flightgear
1
0
Fork 0
Code Activity

Tolerate missing scenery (happens in unit tests)

Browse source
This commit is contained in:
James Turner 2019-09-18 14:46:16 +01:00
parent 810d2e0b13
commit dbbebc8f7e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Scripting/NasalPositioned.cxx
View file

@ -1401,7 +1401,12 @@ static naRef f_geodinfo(naContext c, naRef me, int argc, naRef* args)
double elev = argc == 3 ? naNumValue(args[2]).num : 10000;
const simgear::BVHMaterial *material;
SGGeod geod = SGGeod::fromDegM(lon, lat, elev);
if(!globals->get_scenery()->get_elevation_m(geod, elev, &material))
const auto scenery = globals->get_scenery();
if (scenery == nullptr)
return naNil();
if(!scenery->get_elevation_m(geod, elev, &material))
return naNil();
naRef vec = naNewVector(c);