From: ehofman <ehofman>
Date: Thu, 23 Sep 2004 09:39:55 +0000 (+0000)
Subject: Make the scenerio's work again (now for real) and a small number of updates.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1974be7fafecb307e44beb07598122e9bbfae992;p=flightgear.git

Make the scenerio's work again (now for real) and a small number of updates.
---

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index 0a19d632d..e066b5a09 100644
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -288,26 +288,25 @@ void FGAIManager::processThermal( FGAIThermal* thermal ) {
 }
 
 
-void FGAIManager::processScenario( string filename ) {
+void FGAIManager::processScenario( string &filename ) {
   FGAIScenario* s = new FGAIScenario( filename );
   for (int i=0;i<s->nEntries();i++) {
     FGAIModelEntity* en = s->getNextEntry();
 
     if (en) {
- 
-      if (en->m_type == "aircraft") {
+      if ( !strcmp(en->m_type, "aircraft")) {
          createAircraft( en );
 
-      } else if (en->m_type == "ship") {
+      } else if ( !strcmp(en->m_type, "ship")) {
            createShip( en );
 
-      } else if (en->m_type == "storm") {
+      } else if ( !strcmp(en->m_type, "thunderstorm")) {
         createStorm( en );
 
-      } else if (en->m_type == "thermal") {
+      } else if ( !strcmp(en->m_type, "thermal")) {
         createThermal( en );
 
-      } else if (en->m_type == "ballistic") {
+      } else if ( !strcmp(en->m_type, "ballistic")) {
         createBallistic( en );
       }      
     }
diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 973afa4fd..619d91961 100644
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -82,7 +82,7 @@ public:
       return (0 < ot && ot < FGAIBase::MAX_OBJECTS) ? numObjects[ot] : numObjects[0];
     }
 
-    void processScenario( string filename );
+    void processScenario( string &filename );
 
 private:
 
diff --git a/src/AIModel/AIScenario.cxx b/src/AIModel/AIScenario.cxx
index 7052f5b6f..cd46c170c 100644
--- a/src/AIModel/AIScenario.cxx
+++ b/src/AIModel/AIScenario.cxx
@@ -34,7 +34,7 @@
 
 
 
-FGAIScenario::FGAIScenario(string filename)
+FGAIScenario::FGAIScenario(string &filename)
 {
   int i;
   SGPath path( globals->get_fg_root() );
diff --git a/src/AIModel/AIScenario.hxx b/src/AIModel/AIScenario.hxx
index 424b44970..f7b8f47cd 100644
--- a/src/AIModel/AIScenario.hxx
+++ b/src/AIModel/AIScenario.hxx
@@ -34,7 +34,7 @@ class FGAIScenario {
 
 public:
 
-   FGAIScenario(string filename);
+   FGAIScenario(string &filename);
    ~FGAIScenario();
 
    FGAIModelEntity* getNextEntry( void );
diff --git a/src/AIModel/AIStorm.cxx b/src/AIModel/AIStorm.cxx
index 896253614..edba9038d 100644
--- a/src/AIModel/AIStorm.cxx
+++ b/src/AIModel/AIStorm.cxx
@@ -36,7 +36,7 @@ SG_USING_STD(string);
 
 FGAIStorm::FGAIStorm(FGAIManager* mgr) {
    manager = mgr;   
-   _type_str = "storm";
+   _type_str = "thunderstorm";
    _otype = otStorm;
 }