- changed MAX_GEAR to an enum to avoid upsetting non-conformant C++

  compilers

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index 8c6748225785cc0c9552ad04bb36ba2ebde9aa47..bd80790a2e7d747dd61ed24b0ca68281ad89801b 100644 (file)
--- 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 490c1a14c368688038006cdc77f17bb27d3a004e..5371500adc51b1367796dcc50687cad35382ee32 100644 (file)
--- 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;