Changes to support the new naCall API in SimGear. NOTE: these changes

are *not* backwards compatible, and require current SimGear to
compile.

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index d999cc8cb2b7ef2913ab76de6c6350a078f75fdc..a1475ac008aea98d9a6600d423c2dbb42327017f 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -71,7 +71,7 @@ bool FGNasalSys::parseAndRun(const char* sourceCode)
     if(naIsNil(code))
         return false;
 
-    naCall(_context, code, naNil(), naNil(), naNil());
+    naCall(_context, code, 0, 0, naNil(), naNil());
 
     if(!naGetError(_context)) return true;
     logError();
@@ -444,7 +444,7 @@ void FGNasalSys::createModule(const char* moduleName, const char* fileName,
     if(!naHash_get(_globals, modname, &locals))
         locals = naNewHash(_context);
 
-    naCall(_context, code, naNil(), naNil(), locals);
+    naCall(_context, code, 0, 0, naNil(), locals);
     if(naGetError(_context)) {
         logError();
         return;
@@ -489,7 +489,7 @@ bool FGNasalSys::handleCommand(const SGPropertyNode* arg)
     _cmdArg = (SGPropertyNode*)arg;
 
     // Call it!
-    naRef result = naCall(_context, code, naNil(), naNil(), locals);
+    naRef result = naCall(_context, code, 0, 0, naNil(), locals);
     if(!naGetError(_context)) return true;
     logError();
     return false;
@@ -530,7 +530,7 @@ void FGNasalSys::setTimer(int argc, naRef* args)
 
 void FGNasalSys::handleTimer(NasalTimer* t)
 {
-    naCall(_context, t->handler, naNil(), naNil(), naNil());
+    naCall(_context, t->handler, 0, 0, naNil(), naNil());
     if(naGetError(_context))
         logError();
     gcRelease(t->gcKey);

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index 6f9df4953fda18500dbb3a9807c8c9ee715f6950..4d59b8b2c8aa2908813dcbf14c610719affdd7dc 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -92,7 +92,7 @@ public:
     ~FGNasalScript() { _nas->gcRelease(_gcKey); }
 
     bool call() {
-        naCall(_nas->_context, _code, naNil(), naNil(), naNil());
+        naCall(_nas->_context, _code, 0, 0, naNil(), naNil());
         return naGetError(_nas->_context) == 0;
     }