From 13d8e0edab6830be841af3fef6904bbf630ee009 Mon Sep 17 00:00:00 2001 From: ehofman Date: Mon, 15 Sep 2003 16:00:18 +0000 Subject: [PATCH 1/1] Allow -jsbsim, -yasim or -uiuc in the name of the configuration file when it resides in it's own subdirectory --- src/Main/fg_init.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index e5da97091..38370e9f5 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -534,9 +534,19 @@ bool fgInitConfig ( int argc, char **argv ) { aircraft_path.concat("-set.xml"); if ( !ulFileExists(aircraft_path.c_str()) ) { + string adir = aircraft; + int pos, alen = adir.length(); + + if ( ((pos = adir.rfind("-jsbsim")) != string::npos) || + ((pos = adir.rfind("-yasim")) != string::npos) || + ((pos = adir.rfind("-uiuc")) != string::npos) ) + { + adir.erase(pos, alen); + } + aircraft_path = globals->get_fg_root(); aircraft_path.append("Aircraft"); - aircraft_path.append(aircraft); + aircraft_path.append(adir); aircraft_path.append(aircraft); aircraft_path.concat("-set.xml"); } -- 2.39.5