[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-devel
Subject:    Re: [Flightgear-devel]
From:       Frederic Bouvier <fredfgfs01 () free ! fr>
Date:       2005-01-29 13:00:52
Message-ID: 41FB8904.4060002 () free ! fr
[Download RAW message or body]

Frederic Bouvier a écrit :

> Erik Hofman wrote :
>
>> Frederic Bouvier wrote:
>>
>> I can revert the patch or someone running windows should provide me a 
>> patch instead.
>>
>
> Or do both, because the current patch seems useless.
> Is it windows specific ?


This one seems better ( move the added block 3 lines upward ) :

cvs -z4 -q diff -u fg_init.cxx (in directory 
I:\FlightGear\cvs\FlightGear\src\Main\)
Index: fg_init.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Main/fg_init.cxx,v
retrieving revision 1.116
diff -u -r1.116 fg_init.cxx
--- fg_init.cxx    29 Jan 2005 10:22:44 -0000    1.116
+++ fg_init.cxx    29 Jan 2005 12:56:47 -0000
@@ -340,15 +340,15 @@
         }
     }
 
+    if ( aircraft.empty() ) {
+        // Check for $fg_root/system.fgfsrc
+        SGPath sysconf( globals->get_fg_root() );
+        sysconf.append( "system.fgfsrc" );
+        aircraft = fgScanForOption( "--aircraft=", sysconf.str() );
+    }
     // if an aircraft was specified, set the property name
     if ( !aircraft.empty() ) {
         SG_LOG(SG_INPUT, SG_INFO, "aircraft = " << aircraft );
-        if ( aircraft.empty() ) {
-            // Check for $fg_root/system.fgfsrc
-            SGPath sysconf( globals->get_fg_root() );
-            sysconf.append( "system.fgfsrc" );
-            aircraft = fgScanForOption( "--aircraft=", sysconf.str() );
-        }
         fgSetString("/sim/aircraft", aircraft.c_str() );
     } else {
         SG_LOG(SG_INPUT, SG_INFO, "No user specified aircraft, using 
default" );




_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@flightgear.org
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
2f585eeea02e2c79d7b1d8c4963bae2d

[prev in list] [next in list] [prev in thread] [next in thread]