Various Irix compiler tweaks.

diff --git a/src/ATC/atis.cxx b/src/ATC/atis.cxx
index dc5969c91373d7ec4e28ff9e1122c9043b48cc54..c489cb5d64cd63bd702e3d9efa293ed82e867d3b 100644 (file)
--- a/src/ATC/atis.cxx
+++ b/src/ATC/atis.cxx
@@ -26,6 +26,7 @@
 #include <simgear/compiler.h>
 
 #include <stdlib.h>    // atoi()
+#include <stdio.h>     // sprintf
 #include <string>
 SG_USING_STD(string);
 

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 4b6933e7655a467013b4b6474aa906e7874bb9d4..88608312ca46d45ad0ea931c4496f667de9db13f 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -38,6 +38,7 @@
 
 #include <GL/glut.h>
 #include <stdlib.h>
+#include <stdio.h>     //char related functions
 #include STL_STRING
 #include STL_FSTREAM
 

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index a752227891987aeec5bd67707285cd6d472caecc..239500f9c6d8ecc9bd562304f5e48bc2c6497945 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -26,6 +26,7 @@
 #  include <windows.h>
 #endif
 
+#include <stdio.h>     // sprintf
 #include <string.h>
 
 #include <plib/ssg.h>

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 0107ad8ba106a3fc1bad5f2496aad15e9b68e3ee..b065a8cc2e441c5472ca62995000f739c41757f2 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -25,6 +25,8 @@
 #  include <config.h>
 #endif
 
+#include <stdio.h>     // snprintf
+
 #include <simgear/compiler.h>
 #include <simgear/math/sg_random.h>
 

diff --git a/src/FDM/External.cxx b/src/FDM/External.cxx
index 0c712c1c73c86427996a42952b06009ec12f41f1..cc6c1a2f923881af28c586f4b7988dea2d0010e6 100644 (file)
--- a/src/FDM/External.cxx
+++ b/src/FDM/External.cxx
@@ -37,6 +37,10 @@ FGExternal::~FGExternal() {
 // for each subsequent iteration through the EOM
 void FGExternal::init() {
     // cout << "FGExternal::init()" << endl;
+
+    // Explicitly call the superclass's
+    // init method first.
+    common_init();
 }
 
 

diff --git a/src/FDM/ExternalNet.cxx b/src/FDM/ExternalNet.cxx
index 5953d0d40db9e70b0cd96a33b84ddb69f15a4318..1200c50f3bffed667093e9d9651891122a6feabe 100644 (file)
--- a/src/FDM/ExternalNet.cxx
+++ b/src/FDM/ExternalNet.cxx
@@ -59,6 +59,10 @@ FGExternalNet::~FGExternalNet() {
 // for each subsequent iteration through the EOM
 void FGExternalNet::init() {
     // cout << "FGExternalNet::init()" << endl;
+
+    // Explicitly call the superclass's
+    // init method first.
+    common_init();
 }
 
 

diff --git a/src/Network/atc610x.cxx b/src/Network/atc610x.cxx
index 168317dc7f8c82d81f8d99dec9f348bde11f5c83..e0727095787aaf61c242b275e077fdb2669a24d1 100644 (file)
--- a/src/Network/atc610x.cxx
+++ b/src/Network/atc610x.cxx
@@ -697,6 +697,7 @@ bool FGATC610x::do_radio_switches() {
 bool FGATC610x::do_radio_display() {
 
     char digits[10];
+    int i;
 
     if ( dme_switch != 0 ) {
        // DME minutes
@@ -705,7 +706,7 @@ bool FGATC610x::do_radio_display() {
            minutes = 999.0;
        }
        sprintf(digits, "%03.0f", minutes);
-       for ( int i = 0; i < 6; ++i ) {
+       for ( i = 0; i < 6; ++i ) {
            digits[i] -= '0';
        }
        radio_display_data[0] = digits[1] << 4 | digits[2];
@@ -717,7 +718,7 @@ bool FGATC610x::do_radio_display() {
            knots = 999.0;
        }
        sprintf(digits, "%03.0f", knots);
-       for ( int i = 0; i < 6; ++i ) {
+       for ( i = 0; i < 6; ++i ) {
            digits[i] -= '0';
        }
        radio_display_data[2] = digits[1] << 4 | digits[2];
@@ -729,7 +730,7 @@ bool FGATC610x::do_radio_display() {
            nm = 99.0;
        }
        sprintf(digits, "%04.1f", nm);
-       for ( int i = 0; i < 6; ++i ) {
+       for ( i = 0; i < 6; ++i ) {
            digits[i] -= '0';
        }
        radio_display_data[4] = digits[1] << 4 | digits[3];
@@ -738,7 +739,7 @@ bool FGATC610x::do_radio_display() {
        // display turns on the decimal point
     } else {
        // blank dem display
-       for ( int i = 0; i < 6; ++i ) {
+       for ( i = 0; i < 6; ++i ) {
            radio_display_data[i] = 0xff;
        }
     }
@@ -749,7 +750,7 @@ bool FGATC610x::do_radio_display() {
        com1_stby = 0.0;
     }
     sprintf(digits, "%06.3f", com1_stby);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[6] = digits[4] << 4 | digits[5];
@@ -762,7 +763,7 @@ bool FGATC610x::do_radio_display() {
        com1 = 0.0;
     }
     sprintf(digits, "%06.3f", com1);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[9] = digits[4] << 4 | digits[5];
@@ -777,7 +778,7 @@ bool FGATC610x::do_radio_display() {
        com2_stby = 0.0;
     }
     sprintf(digits, "%06.3f", com2_stby);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[18] = digits[4] << 4 | digits[5];
@@ -790,7 +791,7 @@ bool FGATC610x::do_radio_display() {
        com2 = 0.0;
     }
     sprintf(digits, "%06.3f", com2);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[21] = digits[4] << 4 | digits[5];
@@ -805,7 +806,7 @@ bool FGATC610x::do_radio_display() {
        nav1_stby = 0.0;
     }
     sprintf(digits, "%06.2f", nav1_stby);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[12] = digits[4] << 4 | digits[5];
@@ -818,7 +819,7 @@ bool FGATC610x::do_radio_display() {
        nav1 = 0.0;
     }
     sprintf(digits, "%06.2f", nav1);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[15] = digits[4] << 4 | digits[5];
@@ -833,7 +834,7 @@ bool FGATC610x::do_radio_display() {
        nav2_stby = 0.0;
     }
     sprintf(digits, "%06.2f", nav2_stby);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[24] = digits[4] << 4 | digits[5];
@@ -846,7 +847,7 @@ bool FGATC610x::do_radio_display() {
        nav2 = 0.0;
     }
     sprintf(digits, "%06.2f", nav2);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[27] = digits[4] << 4 | digits[5];
@@ -861,7 +862,7 @@ bool FGATC610x::do_radio_display() {
        adf_stby = 0.0;
     }
     sprintf(digits, "%03.0f", adf_stby);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[30] = digits[2] << 4 | 0x0f;
@@ -873,7 +874,7 @@ bool FGATC610x::do_radio_display() {
        adf = 0.0;
     }
     sprintf(digits, "%03.0f", adf);
-    for ( int i = 0; i < 6; ++i ) {
+    for ( i = 0; i < 6; ++i ) {
        digits[i] -= '0';
     }
     radio_display_data[33] = digits[1] << 4 | digits[2];

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index 70e67bd638b1eb7d64cda862a7d9c3cf601b3634..1e28523e1f63be118128c69b263a08f04e67792d 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -103,7 +103,7 @@ FGFX::init ()
     _crank[i] = new FGSimpleSound(fgGetString("/sim/sounds/cranking/path",
                                              "Sounds/cranking.wav"));
     _crank[i]->set_volume(fgGetFloat("/sim/sounds/cranking/volume", 0.5));
-    _crank[i]->set_pitch(fgGetFloat("/sim/sounds/cranking/pitch", 1.00));
+    _crank[i]->set_pitch(fgGetFloat("/sim/sounds/cranking/pitch", 0.80));
     mgr->add(_crank[i], crank_names[i]);
   }
 
@@ -182,7 +182,7 @@ FGFX::init ()
   // Create and add the click noise.
   _click = new FGSimpleSound(fgGetString("/sim/sounds/click/path",
                                         "Sounds/click.wav"));
-  _flaps->set_volume(fgGetFloat("/sim/sounds/click/volume", 1.0));
+  _flaps->set_volume(fgGetFloat("/sim/sounds/click/volume", 0.5));
   _flaps->set_pitch(fgGetFloat("/sim/sounds/click/pitch", 1.0));
   mgr->add(_click, "click");