diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx index c076d8cfc..3eb853823 100644 --- a/src/Airports/runways.cxx +++ b/src/Airports/runways.cxx @@ -151,9 +151,8 @@ void FGRunway::processThreshold(SGPropertyNode* aThreshold) _displ_thresh = aThreshold->getDoubleValue("displ-m") * SG_METER_TO_FEET; _stopway = aThreshold->getDoubleValue("stopw-m") * SG_METER_TO_FEET; - // compute the new runway center, based on the threshold lat/lon, length, - // and any displaced threshold. - double offsetFt = (0.5 * _length) - _displ_thresh; + // compute the new runway center, based on the threshold lat/lon and length, + double offsetFt = (0.5 * _length); SGGeod newCenter; double dummy; SGGeodesy::direct(newThreshold, _heading, offsetFt * SG_FEET_TO_METER, newCenter, dummy); diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index d10bf4076..26a7987f4 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -49,6 +49,8 @@ #include #include +#include +#include #include #include @@ -135,6 +137,7 @@ #endif using std::string; +using namespace boost::algorithm; extern const char *default_root; @@ -553,7 +556,7 @@ static string fgFindAircraftPath( const SGPath &path, const string &aircraft, n->setStringValue(path.str().c_str()); n->setAttribute(SGPropertyNode::USERARCHIVE, true); - if ( !strcmp(dire->d_name, aircraft.c_str()) ) { + if ( boost::equals(dire->d_name, aircraft.c_str(), is_iequal()) ) { result = path.str(); break; } @@ -636,7 +639,7 @@ bool fgInitConfig ( int argc, char **argv ) { vector cache = cache_root->getChildren("aircraft"); for (unsigned int i = 0; i < cache.size(); i++) { const char *name = cache[i]->getStringValue("file", ""); - if (aircraft_set == name) { + if (boost::equals(aircraft_set, name, is_iequal())) { const char *path = cache[i]->getStringValue("path", ""); SGPath xml(path); xml.append(name);