Constant-speed props were seeking to engine speed, not prop speed.

[flightgear.git] / src / Main / fg_commands.cxx

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index ca3171f8b2ae84618972fddb4f262d3257e54a32..335b25599c8ad379f7fcbb7da8a7cc04d91955d4 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -456,6 +456,17 @@ do_screen_capture (const SGPropertyNode * arg)
 }
 
 
+/**
+ * Built-in command: hires capture screen.
+ */
+static bool
+do_hires_screen_capture (const SGPropertyNode * arg)
+{
+  fgHiResDump();
+  return true;
+}
+
+
 /**
  * Reload the tile cache.
  */
@@ -1142,7 +1153,7 @@ static bool
 do_replay (const SGPropertyNode * arg)
 {
     // freeze the master fdm
-    fgSetBool( "/sim/freeze/replay", true );
+    fgSetInt( "/sim/freeze/replay-state", 1 );
 
     FGReplay *r = (FGReplay *)(globals->get_subsystem( "replay" ));
 
@@ -1213,6 +1224,74 @@ do_hud_init2(const SGPropertyNode *)
     return true;
 }
 
+/**
+ * An fgcommand to allow loading of xml files via nasal,
+ * the xml file's structure will be made available within
+ * a (definable) property tree node
+ *
+ * @param filename a string to hold the complete path & filename of a XML file
+ * @param targetnode a string pointing to a location within the property tree
+ * where to store the parsed XML file
+ */
+
+static bool 
+do_load_xml_to_proptree(const SGPropertyNode * node)
+{
+    // SG_LOG(SG_GENERAL, SG_ALERT, "fgcommand loadxml executed");
+
+    SGPropertyNode * targetnode;
+    targetnode = fgGetNode(node->getNode("targetnode")->getStringValue(),true);
+               
+    const char *filename = node->getNode("filename")->getStringValue();
+    try {
+        fgLoadProps(filename, targetnode);
+    } catch (const sg_exception &e) {
+        string errmsg = "Error reading file " + string(filename) + ":\n";
+        guiErrorMessage(errmsg.c_str(), e);
+        return false;
+    }
+
+    return  true;
+}
+
+
+/**
+ * an fgcommand to allow saving of xml files via nasal,
+ * the file's structure will be determined based on what's
+ * encountered in the passed (source) property tree node
+ *
+ * @param filename a string to hold the complete path & filename of the (new)
+ * XML file
+ * @param sourcenode a string pointing to a location within the property tree
+ * where to find the nodes that should be written recursively into an XML file
+ *
+ * TODO: 
+ *   deal with already existing filenames, optionally return error/success
+ *   values in a separate node to provide status information
+ *
+ * note: it's directly using writeProperties, which is not necessarily
+ *       preferable, but for now it should work ...
+ */
+
+static bool 
+do_save_xml_from_proptree(const SGPropertyNode * node)
+{
+    //TODO: do Parameter validation !
+    SGPropertyNode * sourcenode;
+    sourcenode = fgGetNode(node->getNode("sourcenode")->getStringValue(),true);
+
+    const char *filename = node->getNode("filename")->getStringValue();
+    try {
+        writeProperties (filename, sourcenode, true);
+    } catch (const sg_exception &e) {
+        string errmsg = "Error writing file " + string(filename) + ":\n";
+        guiErrorMessage(errmsg.c_str(), e);
+        return false;
+    }
+
+    return true;
+}
+
 ////////////////////////////////////////////////////////////////////////
 // Command setup.
 ////////////////////////////////////////////////////////////////////////
@@ -1244,6 +1323,7 @@ static struct {
     { "preferences-load", do_preferences_load },
     { "view-cycle", do_view_cycle },
     { "screen-capture", do_screen_capture },
+    { "hires-screen-capture", do_hires_screen_capture },
     { "tile-cache-reload", do_tile_cache_reload },
     { "set-sea-level-air-temp-degc", do_set_sea_level_degc },
     { "set-outside-air-temp-degc", do_set_oat_degc },
@@ -1274,6 +1354,8 @@ static struct {
     { "hud-masterswitch", do_hud_masterswitch },
     { "hud-init", do_hud_init },
     { "hud-init2", do_hud_init2 },
+    { "loadxml", do_load_xml_to_proptree},
+    { "savexml", do_save_xml_from_proptree },    
     { 0, 0 }                   // zero-terminated
 };