fly/flightgear
1
0
Fork 0
Code Activity

revert condition() patch. This can as easily be done in pure Nasal.

Browse source
This commit is contained in:
mfranz 2007-03-18 10:52:11 +00:00
parent 8c7c217037
commit 937ec42fda
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Scripting/NasalSys.cxx
View file

@ -12,7 +12,6 @@
#include <simgear/nasal/nasal.h> #include <simgear/nasal/nasal.h>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/condition.hxx>
#include <simgear/math/sg_random.h> #include <simgear/math/sg_random.h>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/misc/interpolator.hxx> #include <simgear/misc/interpolator.hxx>
@ -281,24 +280,6 @@ static naRef f_removelistener(naContext c, naRef me, int argc, naRef* args)
return nasal->removeListener(c, argc, args); return nasal->removeListener(c, argc, args);
} }
// condition(property) extension function. Evaluates standard <condition>
// (see $FG_ROOT/Docs/README.condition) and returns state.
static naRef f_condition(naContext c, naRef me, int argc, naRef* args)
{
SGPropertyNode* node;
naRef prop = argc > 0 ? args[0] : naNil();
if(naIsString(prop)) node = fgGetNode(naStr_data(prop), true);
else if(naIsGhost(prop)) node = *(SGPropertyNode_ptr*)naGhost_ptr(prop);
else {
naRuntimeError(c, "condition() with invalid property");
return naNil();
}
SGCondition *cond = sgReadCondition(globals->get_props(), node);
bool result = cond->test();
delete cond;
return naNum(result == true ? 1 : 0);
}
// Returns a ghost handle to the argument to the currently executing // Returns a ghost handle to the argument to the currently executing
// command // command
static naRef f_cmdarg(naContext c, naRef me, int argc, naRef* args) static naRef f_cmdarg(naContext c, naRef me, int argc, naRef* args)
@ -375,7 +356,6 @@ static struct { char* name; naCFunction func; } funcs[] = {
{ "settimer", f_settimer }, { "settimer", f_settimer },
{ "_setlistener", f_setlistener }, { "_setlistener", f_setlistener },
{ "removelistener", f_removelistener }, { "removelistener", f_removelistener },
{ "_condition", f_condition },
{ "_cmdarg", f_cmdarg }, { "_cmdarg", f_cmdarg },
{ "_interpolate", f_interpolate }, { "_interpolate", f_interpolate },
{ "rand", f_rand }, { "rand", f_rand },