Added David's 'real' patch rather than my guess at it.

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index f084156092f7bc3531dc3e6ba320646935f353cf..d07f1e867437b805901255f1e018928541e6ebc7 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-noinst_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat
 
 bin_SCRIPTS = runfgfs
 

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index 5e936f5af66809e61be4cbc08a57102ccac106cc..2eae51b8fd27d7813726270d8825518ea02035c6 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -27,6 +27,7 @@ extern bool fgLoadFlight (istream &input);
  *
  * @param path The path of the node, relative to root.
  * @param create true to create the node if it doesn't exist.
+ * @return The node, or 0 if none exists and none was created.
  */
 inline SGPropertyNode * 
 fgGetNode (const string &path, bool create = false)
@@ -35,24 +36,18 @@ fgGetNode (const string &path, bool create = false)
 }
 
 
-#if 0
 /**
- * Get an SGValue pointer that can be queried repeatedly.
+ * Test whether a given node exists.
  *
- * If the property value is going to be accessed within the loop,
- * it is best to use this method for maximum efficiency.
+ * @param path The path of the node, relative to root.
+ * @return true if the node exists, false otherwise.
  */
-inline SGPropertyNode * 
-fgGetNode (const string &name, bool create = false)
+inline bool
+fgHasNode (const string &path)
 {
-  return globals->get_props()->getNode(name, create);
+  return (fgGetNode(path, false) != 0);
 }
-#endif
 
-inline bool fgHasNode (const string &name)
-{
-  return globals->get_props()->getNode(name) != NULL;
-}
 
 inline bool fgGetBool (const string &name, bool defaultValue = false)
 {