From b1027c7b6a7489077cc82bfe2956c78a08e68509 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 5 Feb 2002 15:57:46 +0000 Subject: [PATCH] Various Irix compiler tweaks. --- src/ATC/atis.cxx | 1 + src/Cockpit/hud.cxx | 1 + src/Cockpit/panel.cxx | 1 + src/Cockpit/radiostack.cxx | 2 ++ src/FDM/External.cxx | 4 ++++ src/FDM/ExternalNet.cxx | 4 ++++ src/Network/atc610x.cxx | 29 +++++++++++++++-------------- src/Sound/fg_fx.cxx | 4 ++-- 8 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/ATC/atis.cxx b/src/ATC/atis.cxx index dc5969c91..c489cb5d6 100644 --- a/src/ATC/atis.cxx +++ b/src/ATC/atis.cxx @@ -26,6 +26,7 @@ #include #include // atoi() +#include // sprintf #include SG_USING_STD(string); diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx index 4b6933e76..88608312c 100644 --- a/src/Cockpit/hud.cxx +++ b/src/Cockpit/hud.cxx @@ -38,6 +38,7 @@ #include #include +#include //char related functions #include STL_STRING #include STL_FSTREAM diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx index a75222789..239500f9c 100644 --- a/src/Cockpit/panel.cxx +++ b/src/Cockpit/panel.cxx @@ -26,6 +26,7 @@ # include #endif +#include // sprintf #include #include diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx index 0107ad8ba..b065a8cc2 100644 --- a/src/Cockpit/radiostack.cxx +++ b/src/Cockpit/radiostack.cxx @@ -25,6 +25,8 @@ # include #endif +#include // snprintf + #include #include diff --git a/src/FDM/External.cxx b/src/FDM/External.cxx index 0c712c1c7..cc6c1a2f9 100644 --- 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 5953d0d40..1200c50f3 100644 --- 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 168317dc7..e07270957 100644 --- 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 70e67bd63..1e28523e1 100644 --- 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"); -- 2.39.5