From bcca6a88a4ecf53b7db2267b4972a6ee5c4c3734 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 20 Nov 2001 22:03:40 +0000 Subject: [PATCH] - changed MAX_GEAR to an enum to avoid upsetting non-conformant C++ compilers --- src/Sound/fg_fx.cxx | 2 +- src/Sound/fg_fx.hxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx index 8c6748225..bd80790a2 100644 --- a/src/Sound/fg_fx.cxx +++ b/src/Sound/fg_fx.cxx @@ -236,7 +236,7 @@ FGFX::update () // Update the rumble. //////////////////////////////////////////////////////////////////// - float totalGear = min(cur_fdm_state->get_num_gear(), MAX_GEAR); + float totalGear = min(cur_fdm_state->get_num_gear(), int(MAX_GEAR)); float gearOnGround = 0; diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx index 490c1a14c..5371500ad 100644 --- a/src/Sound/fg_fx.hxx +++ b/src/Sound/fg_fx.hxx @@ -59,7 +59,9 @@ private: void set_playing (const char * soundName, bool state = true); - static const int MAX_GEAR = 20; + enum { + MAX_GEAR = 20 + }; double _old_flap_position; -- 2.39.5