Attempt #1 to sort out confusion between left / right / parking brake

[flightgear.git] / src / Cockpit / panel_io.cxx

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 7bb8f27261712b0f99d1a7ff5348f6860d7073e3..e24aafc62b8744c987520ea750721735754e4615 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -29,11 +29,10 @@
 #include <string.h>            // for strcmp()
 
 #include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
-
-#include <simgear/misc/sg_path.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props.hxx>
 
 #include STL_IOSTREAM
 #include STL_FSTREAM
@@ -132,12 +131,13 @@ readTexture (const SGPropertyNode * node)
 ////////////////////////////////////////////////////////////////////////
 
 static void
-readConditions (FGConditional * component, const SGPropertyNode * node)
+readConditions (SGConditional *component, const SGPropertyNode *node)
 {
   const SGPropertyNode * conditionNode = node->getChild("condition");
   if (conditionNode != 0)
                                // The top level is implicitly AND
-    component->setCondition(fgReadCondition(conditionNode));
+    component->setCondition(sgReadCondition(globals->get_props(),
+                                            conditionNode) );
 }
 
 
@@ -238,7 +238,7 @@ readTransformation (const SGPropertyNode * node, float w_scale, float h_scale)
   SGPropertyNode * target = 0;
 
   if (type.empty()) {
-    SG_LOG( SG_COCKPIT, SG_ALERT,
+    SG_LOG( SG_COCKPIT, SG_INFO,
             "No type supplied for transformation " << name
             << " assuming \"rotation\"" );
     type = "rotation";
@@ -418,7 +418,7 @@ readLayer (const SGPropertyNode * node, float w_scale, float h_scale)
 
 
   if (type.empty()) {
-    SG_LOG( SG_COCKPIT, SG_ALERT,
+    SG_LOG( SG_COCKPIT, SG_INFO,
             "No type supplied for layer " << name
             << " assuming \"texture\"" );
     type = "texture";