fly/flightgear
1
0
Fork 0
Code Activity

even more warning fixes

Browse source
This commit is contained in:
torsten 2009-08-21 14:42:49 +00:00 committed by Tim Moore
parent e294ab7b39
commit 2ea02594c0
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Airports/calc_loc.cxx
View file

@ -42,7 +42,7 @@ int main( int argc, char **argv ) {
}
// calculate runway threshold point
double thresh_lat, thresh_lon, return_az;
double thresh_lat = 0.0, thresh_lon = 0.0, return_az = 0.0;
geo_direct_wgs_84 ( 0.0, rwy_lat, rwy_lon, rwy_hdg,
rwy_len / 2.0, &thresh_lat, &thresh_lon, &return_az );
cout << "Threshold = " << thresh_lat << "," << thresh_lon << endl;
@ -54,7 +54,7 @@ int main( int argc, char **argv ) {
cout << "Distance = " << dist_m << endl;
// back project that distance along the runway center line
double nloc_lat, nloc_lon;
double nloc_lat = 0.0, nloc_lon = 0.0;
geo_direct_wgs_84 ( 0.0, thresh_lat, thresh_lon, rwy_hdg + 180.0,
dist_m, &nloc_lat, &nloc_lon, &return_az );
printf("New localizer = %.6f %.6f\n", nloc_lat, nloc_lon );

2
src/Airports/dynamicloader.cxx
View file

@ -117,6 +117,8 @@ void FGAirportDynamicsXMLLoader::startElement (const char * name, const XMLAttr
holdPointType=3;
} else if (attval==string("PushBack")) {
holdPointType=3;
} else {
holdPointType=0;
}
//cerr << "Setting Holding point to " << holdPointType << endl;
taxiNode.setHoldPointType(holdPointType);

4
src/Airports/dynamics.cxx
View file

@ -536,9 +536,9 @@ const string& FGAirportDynamics::getId() const {
// so that at least I can start working on assigning different frequencies to different
// operations.
int FGAirportDynamics::getGroundFrequency(int leg) {
int FGAirportDynamics::getGroundFrequency(unsigned leg) {
//return freqGround.size() ? freqGround[0] : 0; };
int groundFreq;
int groundFreq = 0;
if (leg < 2) {
SG_LOG(SG_ATC, SG_ALERT, "Leg value is smaller than two at " << SG_ORIGIN);
}

2
src/Airports/dynamics.hxx
View file

@ -117,7 +117,7 @@ public:
FGTowerController *getTowerController() { return &towerController; };
const string& getAtisInformation() { return atisInformation; };
int getGroundFrequency(int leg); //{ return freqGround.size() ? freqGround[0] : 0; };
int getGroundFrequency(unsigned leg); //{ return freqGround.size() ? freqGround[0] : 0; };
void setRwyUse(const FGRunwayPreference& ref);
};

14
src/Airports/groundnetwork.cxx
View file

@ -267,11 +267,11 @@ void FGGroundNetwork::init()
{
if ((*j)->getEnd()->getIndex() == (*i)->getStart()->getIndex())
{
int start1 = (*i)->getStart()->getIndex();
int end1 = (*i)->getEnd() ->getIndex();
int start2 = (*j)->getStart()->getIndex();
int end2 = (*j)->getEnd()->getIndex();
int oppIndex = (*j)->getIndex();
// int start1 = (*i)->getStart()->getIndex();
// int end1 = (*i)->getEnd() ->getIndex();
// int start2 = (*j)->getStart()->getIndex();
// int end2 = (*j)->getEnd()->getIndex();
// int oppIndex = (*j)->getIndex();
//cerr << "Opposite of " << (*i)->getIndex() << " (" << start1 << "," << end1 << ") "
// << "happens to be " << oppIndex << " (" << start2 << "," << end2 << ") " << endl;
(*i)->setOpposite(*j);
@ -316,7 +316,7 @@ int FGGroundNetwork::findNearestNode(double lat, double lon)
return findNearestNode(SGGeod::fromDeg(lon, lat));
}
FGTaxiNode *FGGroundNetwork::findNode(int idx)
FGTaxiNode *FGGroundNetwork::findNode(unsigned idx)
{ /*
for (FGTaxiNodeVectorIterator
itr = nodes.begin();
@ -332,7 +332,7 @@ FGTaxiNode *FGGroundNetwork::findNode(int idx)
return 0;
}
FGTaxiSegment *FGGroundNetwork::findSegment(int idx)
FGTaxiSegment *FGGroundNetwork::findSegment(unsigned idx)
{/*
for (FGTaxiSegmentVectorIterator
itr = segments.begin();

4
src/Airports/groundnetwork.hxx
View file

@ -256,8 +256,8 @@ public:
int findNearestNode(double lat, double lon);
int findNearestNode(const SGGeod& aGeod);
FGTaxiNode *findNode(int idx);
FGTaxiSegment *findSegment(int idx);
FGTaxiNode *findNode(unsigned idx);
FGTaxiSegment *findSegment(unsigned idx);
FGTaxiRoute findShortestRoute(int start, int end, bool fullSearch=true);
//void trace(FGTaxiNode *, int, int, double dist);