Fix some warnings

diff --git a/src/ATC/atc_mgr.hxx b/src/ATC/atc_mgr.hxx
index 03d37690c18f4440cba9976076162a9bbde43bac..09d40197a36a7ec0294562d311a24367898bb6d3 100644 (file)
--- a/src/ATC/atc_mgr.hxx
+++ b/src/ATC/atc_mgr.hxx
@@ -53,7 +53,6 @@ private:
   bool networkVisible;
   bool initSucceeded;
   SGPropertyNode_ptr trans_num;
-  ParkingAssignment *pk;
 
 public:
   FGATCManager();

diff --git a/src/Network/AV400WSim.hxx b/src/Network/AV400WSim.hxx
index 62759724a470608e10c3e725a7656ddc2dee58bd..e79b562c49d8e5142d676af90fc59ae46797a67f 100644 (file)
--- a/src/Network/AV400WSim.hxx
+++ b/src/Network/AV400WSim.hxx
@@ -94,7 +94,7 @@ class FGAV400WSimB : public FGProtocol {
     FlightProperties* fdm;
     
     static const int SOM_SIZE = 2;
-    static const int DEG_TO_MILLIARCSECS = ( 60.0 * 60.0 * 1000 );
+    static const int DEG_TO_MILLIARCSECS = ( 60 * 60 * 1000 );
     
     // Flight Phases
     static const int PHASE_OCEANIC  =   4;

diff --git a/src/Sound/beacon.hxx b/src/Sound/beacon.hxx
index c60f4822554b9aa780cc7f7673d6cac245c57246..a85244f9bb099cabaf2dac8fa1dd90b1d61c5181 100644 (file)
--- a/src/Sound/beacon.hxx
+++ b/src/Sound/beacon.hxx
@@ -82,10 +82,10 @@ private:
     static const int MIDDLE_SIZE = (int)(BYTES_PER_SECOND * 60 / 95 );
     static const int OUTER_SIZE = BYTES_PER_SECOND;
 
-    static const int INNER_DIT_LEN = (int)(BYTES_PER_SECOND / 6.0);
-    static const int MIDDLE_DIT_LEN = (int)(MIDDLE_SIZE / 3.0);
-    static const int MIDDLE_DAH_LEN = (int)(MIDDLE_SIZE * 2 / 3.0);
-    static const int OUTER_DAH_LEN = (int)(BYTES_PER_SECOND / 2.0);
+    static const int INNER_DIT_LEN = (int)(BYTES_PER_SECOND / 6);
+    static const int MIDDLE_DIT_LEN = (int)(MIDDLE_SIZE / 3);
+    static const int MIDDLE_DAH_LEN = (int)(MIDDLE_SIZE * 2 / 3);
+    static const int OUTER_DAH_LEN = (int)(BYTES_PER_SECOND / 2);
 
     SGSharedPtr<SGSoundSample> inner;
     SGSharedPtr<SGSoundSample> middle;

diff --git a/src/Sound/morse.hxx b/src/Sound/morse.hxx
index c5fe7cc8fa217039e53210e2691a914a6d4453ca..1f54fa81ddde0ed85ac15fd517efd50e75646649 100644 (file)
--- a/src/Sound/morse.hxx
+++ b/src/Sound/morse.hxx
@@ -99,7 +99,7 @@ public:
     static const int BYTES_PER_SECOND = 22050;
     // static const int BEAT_LENGTH = 240; // milleseconds (5 wpm)
     static const int BEAT_LENGTH = 92;  // milleseconds (13 wpm)
-    static const int TRANSITION_BYTES = (int)(0.005 * BYTES_PER_SECOND);
+    static const int TRANSITION_BYTES = BYTES_PER_SECOND/200; // aka (int)(0.005 * BYTES_PER_SECOND);
     static const int COUNT_SIZE = BYTES_PER_SECOND * BEAT_LENGTH / 1000;
     static const int DIT_SIZE = 2 * COUNT_SIZE;   // 2 counts
     static const int DAH_SIZE = 4 * COUNT_SIZE;   // 4 counts

diff --git a/src/Sound/soundgenerator.hxx b/src/Sound/soundgenerator.hxx
index fa600f3478801d1d45e227294fbc3a42eb2bdd39..48ebe8592b07793f8d84420982daf0014debf4cd 100644 (file)
--- a/src/Sound/soundgenerator.hxx
+++ b/src/Sound/soundgenerator.hxx
@@ -33,7 +33,7 @@ public:
     static const int BYTES_PER_SECOND = 22050;\r
     // static const int BEAT_LENGTH = 240; // milleseconds (5 wpm)\r
     static const int BEAT_LENGTH = 92;  // milleseconds (13 wpm)\r
-    static const int TRANSITION_BYTES = (int)(0.005 * BYTES_PER_SECOND);\r
+    static const int TRANSITION_BYTES = BYTES_PER_SECOND/200; // aka (int)(0.005 * BYTES_PER_SECOND);\r
     static const int COUNT_SIZE = BYTES_PER_SECOND * BEAT_LENGTH / 1000;\r
     static const int DIT_SIZE = 2 * COUNT_SIZE;   // 2 counts\r
     static const int DAH_SIZE = 4 * COUNT_SIZE;   // 4 counts\r