Maik JUSTUS: fix bug in previous commit

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index b56a7893a3f50b0cb296ce6e8d1360c4e9fff66d..b7ad31f0f2503d6281e66cdb1a2f206466a0b53b 100644 (file)
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -118,9 +118,9 @@ void FGAIAircraft::readFromScenario(SGPropertyNode* scFileNode) {
 }
 
 
-bool FGAIAircraft::init() {
+bool FGAIAircraft::init(bool search_in_AI_path) {
     //refuel_node = fgGetNode("systems/refuel/contact", true);
-    return FGAIBase::init(true);
+    return FGAIBase::init(search_in_AI_path);
 }
 
 

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index a848346cf090aeeb3704dfefc34a61acb14d71e6..d1b331d71c445904cce06bb59592de62134b108d 100644 (file)
--- a/src/AIModel/AIAircraft.hxx
+++ b/src/AIModel/AIAircraft.hxx
@@ -62,7 +62,7 @@ public:
 
     virtual void readFromScenario(SGPropertyNode* scFileNode);
 
-    virtual bool init();
+    virtual bool init(bool search_in_AI_path=false);
     virtual void bind();
     virtual void unbind();
     virtual void update(double dt);

diff --git a/src/AIModel/AIBallistic.cxx b/src/AIModel/AIBallistic.cxx
index c7a5ab72c2c78f94318df4e1fe7ba902e9d40c88..1dd2a2f4f156b5152d6b1af8d09d6aa81367cc34 100644 (file)
--- a/src/AIModel/AIBallistic.cxx
+++ b/src/AIModel/AIBallistic.cxx
@@ -59,8 +59,8 @@ void FGAIBallistic::readFromScenario(SGPropertyNode* scFileNode) {
   setStabilisation(scFileNode->getBoolValue("aero_stabilized", false));
 }
 
-bool FGAIBallistic::init() {
-   FGAIBase::init();
+bool FGAIBallistic::init(bool search_in_AI_path) {
+   FGAIBase::init(search_in_AI_path);
    hdg = azimuth;
    pitch = elevation;
    roll = rotation;

diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx
index 6b5441304f0ba5966c458f9b2c27f92746290e73..0137ac1f2b83c28bf1327eb198c82738a9aa3c00 100644 (file)
--- a/src/AIModel/AIBallistic.hxx
+++ b/src/AIModel/AIBallistic.hxx
@@ -33,7 +33,7 @@ public:
 
     void readFromScenario(SGPropertyNode* scFileNode);
 
-    bool init();
+    bool init(bool search_in_AI_path=false);
     virtual void bind();
     virtual void unbind();
     void update(double dt);

diff --git a/src/AIModel/AICarrier.cxx b/src/AIModel/AICarrier.cxx
index 0ec684609330c0ac19211bcacc7e62e6b9aa493a..3a83c13fee7f7fe76487ff4afc995e7353cb3a13 100644 (file)
--- a/src/AIModel/AICarrier.cxx
+++ b/src/AIModel/AICarrier.cxx
@@ -309,8 +309,8 @@ void FGAICarrier::update(double dt) {
       source = 0;
 } //end update
 
-bool FGAICarrier::init() {
-    if (!FGAIShip::init())
+bool FGAICarrier::init(bool search_in_AI_path) {
+    if (!FGAIShip::init(search_in_AI_path))
         return false;
 
     // process the 3d model here

diff --git a/src/AIModel/AICarrier.hxx b/src/AIModel/AICarrier.hxx
index d76e1ed0eae8525aac7bac9a608bcdabae1b384a..33c674055c69b377c71eb033df51f0bb1e761230 100644 (file)
--- a/src/AIModel/AICarrier.hxx
+++ b/src/AIModel/AICarrier.hxx
@@ -102,7 +102,7 @@ public:
     void ReturnToBox();
     bool OutsideBox();
 
-    bool init();
+    bool init(bool search_in_AI_path=false);
 
     virtual const char* getTypeString(void) const { return "carrier"; }
 

diff --git a/src/AIModel/AIMultiplayer.cxx b/src/AIModel/AIMultiplayer.cxx
index 9888d58efaeb54e1417bf6ca0757a3876be1edc0..8e59b929f82f6bd654c9833ae2ce550aad3e981e 100755 (executable)
--- a/src/AIModel/AIMultiplayer.cxx
+++ b/src/AIModel/AIMultiplayer.cxx
@@ -43,7 +43,7 @@ FGAIMultiplayer::FGAIMultiplayer() : FGAIBase(otMultiplayer) {
 FGAIMultiplayer::~FGAIMultiplayer() {
 }
 
-bool FGAIMultiplayer::init() {
+bool FGAIMultiplayer::init(bool search_in_AI_path) {
     //refuel_node = fgGetNode("systems/refuel/contact", true);
     isTanker = false; // do this until this property is
                       // passed over the net
@@ -57,7 +57,7 @@ bool FGAIMultiplayer::init() {
         isTanker = true;
         //        cout << "isTanker " << isTanker << " " << mCallSign <<endl;
     }
-   return FGAIBase::init(true);
+   return FGAIBase::init(search_in_AI_path);
 }
 
 void FGAIMultiplayer::bind() {

diff --git a/src/AIModel/AIMultiplayer.hxx b/src/AIModel/AIMultiplayer.hxx
index 7fec2d05779408fff27c72c1d348936019a1f55c..596803a8d66c1c4157765f77fc80555c5a6fd971 100755 (executable)
--- a/src/AIModel/AIMultiplayer.hxx
+++ b/src/AIModel/AIMultiplayer.hxx
@@ -32,7 +32,7 @@ public:
   FGAIMultiplayer();
   virtual ~FGAIMultiplayer();
 
-  virtual bool init();
+  virtual bool init(bool search_in_AI_path=false);
   virtual void bind();
   virtual void unbind();
   virtual void update(double dt);

diff --git a/src/AIModel/AIShip.cxx b/src/AIModel/AIShip.cxx
index 2c8e3993f3f85193319532712d036a444045c6f5..5ea0c0976f96e40092b5c3b34f7c9737cbad560e 100644 (file)
--- a/src/AIModel/AIShip.cxx
+++ b/src/AIModel/AIShip.cxx
@@ -50,7 +50,7 @@ void FGAIShip::readFromScenario(SGPropertyNode* scFileNode) {
   }
 }
 
-bool FGAIShip::init() {
+bool FGAIShip::init(bool search_in_AI_path) {
    
    hdg_lock = false;
    rudder = 0.0;
@@ -61,7 +61,7 @@ bool FGAIShip::init() {
    speed_constant = 0.05;
    hdg_constant = 0.01;
    
-   return FGAIBase::init();
+   return FGAIBase::init(search_in_AI_path);
 }
 
 void FGAIShip::bind() {

diff --git a/src/AIModel/AIShip.hxx b/src/AIModel/AIShip.hxx
index 90a58f108b60bc882846c3d6926057585616b9ae..78fd6702a8620919b4fa976db97cd10089b7fec5 100644 (file)
--- a/src/AIModel/AIShip.hxx
+++ b/src/AIModel/AIShip.hxx
@@ -33,7 +33,7 @@ public:
        
         virtual void readFromScenario(SGPropertyNode* scFileNode);
 
-       virtual bool init();
+       virtual bool init(bool search_in_AI_path=false);
         virtual void bind();
         virtual void unbind();
        virtual void update(double dt);

diff --git a/src/AIModel/AIStatic.cxx b/src/AIModel/AIStatic.cxx
index ce8806e5501f1f54a9ca43a8d395ce10db12c63e..a480e2eeedf5517468b57ebf267b3b0efc502b4d 100644 (file)
--- a/src/AIModel/AIStatic.cxx
+++ b/src/AIModel/AIStatic.cxx
@@ -41,8 +41,8 @@ FGAIStatic::FGAIStatic() : FGAIBase(otStatic) {
 FGAIStatic::~FGAIStatic() {
 }
 
-bool FGAIStatic::init() {
-   return FGAIBase::init(true);
+bool FGAIStatic::init(bool search_in_AI_path) {
+   return FGAIBase::init(search_in_AI_path);
 }
 
 void FGAIStatic::bind() {

diff --git a/src/AIModel/AIStatic.hxx b/src/AIModel/AIStatic.hxx
index 6f78131772797ab902f94d182c2bf93b55fdd007..384ff1b182fb7afba3450f5085d8970230586374 100644 (file)
--- a/src/AIModel/AIStatic.hxx
+++ b/src/AIModel/AIStatic.hxx
@@ -35,7 +35,7 @@ public:
        FGAIStatic();
        ~FGAIStatic();
 
-       virtual bool init();
+       virtual bool init(bool search_in_AI_path=false);
         virtual void bind();
         virtual void unbind();
        virtual void update(double dt);

diff --git a/src/AIModel/AIStorm.cxx b/src/AIModel/AIStorm.cxx
index 51e79e31cc4b5795ac3f6a6d018b1bb4834ec1c9..2a99b2c312000b6c29637df1c5dd8376746e8be4 100644 (file)
--- a/src/AIModel/AIStorm.cxx
+++ b/src/AIModel/AIStorm.cxx
@@ -74,8 +74,8 @@ void FGAIStorm::readFromScenario(SGPropertyNode* scFileNode) {
   setStrengthNorm(scFileNode->getDoubleValue("strength-norm", 1.0)); 
 }
 
-bool FGAIStorm::init() {
-   return FGAIBase::init();
+bool FGAIStorm::init(bool search_in_AI_path) {
+   return FGAIBase::init(search_in_AI_path);
 }
 
 void FGAIStorm::bind() {

diff --git a/src/AIModel/AIStorm.hxx b/src/AIModel/AIStorm.hxx
index 8d2df2f091f82635d8aaa7f3e2b323246a545297..3a0153fc5b25654c2c6dc56d7507d7a929d99159 100644 (file)
--- a/src/AIModel/AIStorm.hxx
+++ b/src/AIModel/AIStorm.hxx
@@ -37,7 +37,7 @@ public:
        
         void readFromScenario(SGPropertyNode* scFileNode);
 
-       virtual bool init();
+       virtual bool init(bool search_in_AI_path=false);
         virtual void bind();
         virtual void unbind();
        virtual void update(double dt);

diff --git a/src/AIModel/AIThermal.cxx b/src/AIModel/AIThermal.cxx
index 0253a0f8b83e94a40586ffe61eb876046ec011bd..d01421c734c9c2fea76b67baf09239f0ee3ec7d6 100644 (file)
--- a/src/AIModel/AIThermal.cxx
+++ b/src/AIModel/AIThermal.cxx
@@ -54,10 +54,10 @@ void FGAIThermal::readFromScenario(SGPropertyNode* scFileNode) {
   setHeight(scFileNode->getDoubleValue("height-msl", 5000.0));
 }
 
-bool FGAIThermal::init() {
+bool FGAIThermal::init(bool search_in_AI_path) {
    factor = 8.0 * max_strength / (diameter * diameter * diameter);
    setAltitude( height );
-   return FGAIBase::init();
+   return FGAIBase::init(search_in_AI_path);
 }
 
 void FGAIThermal::bind() {

diff --git a/src/AIModel/AIThermal.hxx b/src/AIModel/AIThermal.hxx
index 03fcd3213f5f2c04f168a92652feab3f1a236e99..38a50bea9da7784a107eefd3e74f623bb47bdc98 100644 (file)
--- a/src/AIModel/AIThermal.hxx
+++ b/src/AIModel/AIThermal.hxx
@@ -37,7 +37,7 @@ public:
        
         void readFromScenario(SGPropertyNode* scFileNode);
 
-       virtual bool init();
+       virtual bool init(bool search_in_AI_path=false);
         virtual void bind();
         virtual void unbind();
        virtual void update(double dt);