Performance optimization: empty() instead of size()>0

[flightgear.git] / src / Scripting / NasalPositioned.cxx

diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx
index 9fb00c62b95d7452789c2ad614118e8c4add1521..fced59becc44b03c51c99a0e28175f8985768835 100644 (file)
--- a/src/Scripting/NasalPositioned.cxx
+++ b/src/Scripting/NasalPositioned.cxx
@@ -1741,13 +1741,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);
   }
   
@@ -1922,6 +1920,10 @@ static naRef f_createWP(naContext c, naRef me, int argc, naRef* args)
 // 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);
   }
   
@@ -1949,6 +1951,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);
   }
   
@@ -2118,6 +2123,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();
 }