X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAirports%2Fgroundnetwork.hxx;h=06ed98b12710f1f92aa1137a2a60cb78ca129d2f;hb=52b0baace1d3ef636b4e1c8f8f1bd047f8d0b023;hp=e602f9094845e58218c3e010a422bf37b0466cce;hpb=76958a038251a697ad798bce630e7d793797cf78;p=flightgear.git diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx index e602f9094..06ed98b12 100644 --- a/src/Airports/groundnetwork.hxx +++ b/src/Airports/groundnetwork.hxx @@ -162,7 +162,7 @@ private: intVec nodes; intVec routes; double distance; - int depth; +// int depth; intVecIterator currNode; intVecIterator currRoute; @@ -173,14 +173,14 @@ public: routes = rts; distance = dist; currNode = nodes.begin(); - depth = dpth; +// depth = dpth; }; FGTaxiRoute& operator= (const FGTaxiRoute &other) { nodes = other.nodes; routes = other.routes; distance = other.distance; - depth = other.depth; +// depth = other.depth; currNode = nodes.begin(); currRoute = routes.begin(); return *this; @@ -190,7 +190,7 @@ public: nodes(copy.nodes), routes(copy.routes), distance(copy.distance), - depth(copy.depth), +// depth(copy.depth), currNode(nodes.begin()), currRoute(routes.begin()) {}; @@ -203,7 +203,7 @@ public: void first() { currNode = nodes.begin(); currRoute = routes.begin(); }; int size() { return nodes.size(); }; - int getDepth() { return depth; }; +// int getDepth() { return depth; }; }; typedef vector TaxiRouteVector; @@ -227,7 +227,6 @@ private: TaxiRouteVector routes; TrafficVector activeTraffic; TrafficVectorIterator currTraffic; - SGWayPoint destination; bool foundRoute; double totalDistance, maxDistance; @@ -253,12 +252,12 @@ public: void init(); bool exists() { return hasNetwork; }; void setTowerController(FGTowerController *twrCtrlr) { towerController = twrCtrlr; }; - + 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); @@ -270,7 +269,7 @@ public: double lat, double lon, double hdg, double spd, double alt, double radius, int leg, FGAIAircraft *aircraft); virtual void signOff(int id); - virtual void update(int id, double lat, double lon, double heading, double speed, double alt, double dt); + virtual void updateAircraftInformation(int id, double lat, double lon, double heading, double speed, double alt, double dt); virtual bool hasInstruction(int id); virtual FGATCInstruction getInstruction(int id);