Fix line endings

[flightgear.git] / src / Instrumentation / dclgps.cxx

diff --git a/src/Instrumentation/dclgps.cxx b/src/Instrumentation/dclgps.cxx
index b78806b288732646e89bd6d6da9d7cf81d9e4680..1000bd945280150608ccfb84504a7bf49beb6604 100644 (file)
--- a/src/Instrumentation/dclgps.cxx
+++ b/src/Instrumentation/dclgps.cxx
@@ -26,6 +26,8 @@
 #include "dclgps.hxx"
 
 #include <simgear/sg_inlines.h>
+#include <simgear/structure/commands.hxx>
+#include <Main/fg_props.hxx>
 #include <iostream>
 SG_USING_STD(cout);
 
@@ -888,11 +890,11 @@ double DCLGPS::GetCDIDeflection() const {
 }
 
 void DCLGPS::DtoInitiate(const string& s) {
-       cout << "DtoInitiate, s = " << s << '\n';
+       //cout << "DtoInitiate, s = " << s << '\n';
        bool multi;
        const GPSWaypoint* wp = FindFirstById(s, multi, true);
        if(wp) {
-               cout << "Waypoint found, starting dto operation!\n";
+               //cout << "Waypoint found, starting dto operation!\n";
                _dto = true;
                _activeWaypoint = *wp;
                _fromWaypoint.lat = _gpsLat;
@@ -900,7 +902,7 @@ void DCLGPS::DtoInitiate(const string& s) {
                _fromWaypoint.type = GPS_WP_VIRT;
                _fromWaypoint.id = "DTOWP";
        } else {
-               cout << "Waypoint not found, ignoring dto request\n";
+               //cout << "Waypoint not found, ignoring dto request\n";
                // Should bring up the user waypoint page, but we're not implementing that yet.
                _dto = false;   // TODO - implement this some day.
        }
@@ -930,7 +932,7 @@ void DCLGPS::OBSPressed() {
        _obsMode = !_obsMode;
        if(_obsMode) {
                if(!_activeWaypoint.id.empty()) {
-                       _obsHeading = _dtkMag;
+                       _obsHeading = static_cast<int>(_dtkMag);
                }
                // TODO - the _fromWaypoint location will change as the OBS heading changes.
                // Might need to store the OBS initiation position somewhere in case it is needed again.