Maik Justus:

Here the patch that makes fg search for multiplayer aircraft in AI/Aircraft
first.

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index da109c1c7ae8fd25753ec87f26f54168ea5c6ca2..2a1abff840e822604cc7c89094a78626f530e7e3 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -128,12 +128,22 @@ void FGAIBase::Transform() {
 bool FGAIBase::init() {
 
    if (!model_path.empty()) {
+     SGPath ai_path("AI");
+     ai_path.append(model_path);
      try {
-       model = load3DModel( globals->get_fg_root(), model_path, props,
-                            globals->get_sim_time_sec() );
+       model = load3DModel( globals->get_fg_root(), ai_path.str(), props,
+                        globals->get_sim_time_sec() );
      } catch (const sg_exception &e) {
        model = NULL;
      }
+     if (!model) {
+       try {
+         model = load3DModel( globals->get_fg_root(), model_path, props,
+                        globals->get_sim_time_sec() );
+       } catch (const sg_exception &e) {
+         model = NULL;
+       }
+     }
    }
    if (model.get()) {
      aip.init( model.get() );