Suppress MSVC warnings

[flightgear.git] / src / Input / input.cxx

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 912d8fc6135fcda50290f0c2544118286e7b1395..4a9b2549f7ca7dbb86027f5f04a16761039545cd 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -89,37 +89,37 @@ getModifiers ()
 static bool
 getModShift ()
 {
-  return bool(fgGetKeyModifiers() & KEYMOD_SHIFT);
+  return (fgGetKeyModifiers() & KEYMOD_SHIFT) != 0;
 }
 
 static bool
 getModCtrl ()
 {
-  return bool(fgGetKeyModifiers() & KEYMOD_CTRL);
+  return (fgGetKeyModifiers() & KEYMOD_CTRL) != 0;
 }
 
 static bool
 getModAlt ()
 {
-  return bool(fgGetKeyModifiers() & KEYMOD_ALT);
+  return (fgGetKeyModifiers() & KEYMOD_ALT) != 0;
 }
 
 static bool
 getModMeta ()
 {
-  return bool(fgGetKeyModifiers() & KEYMOD_META);
+  return (fgGetKeyModifiers() & KEYMOD_META) != 0;
 }
 
 static bool
 getModSuper ()
 {
-  return bool(fgGetKeyModifiers() & KEYMOD_SUPER);
+  return (fgGetKeyModifiers() & KEYMOD_SUPER) != 0;
 }
 
 static bool
 getModHyper ()
 {
-  return bool(fgGetKeyModifiers() & KEYMOD_HYPER);
+  return (fgGetKeyModifiers() & KEYMOD_HYPER) != 0;
 }
 
 \f
@@ -255,13 +255,13 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 
   _key_code = k;
   _key_modifiers = modifiers >> 1;
-  _key_pressed = !bool(modifiers & KEYMOD_RELEASED);
-  _key_shift = bool(modifiers & KEYMOD_SHIFT);
-  _key_ctrl = bool(modifiers & KEYMOD_CTRL);
-  _key_alt = bool(modifiers & KEYMOD_ALT);
-  _key_meta = bool(modifiers & KEYMOD_META);
-  _key_super = bool(modifiers & KEYMOD_SUPER);
-  _key_hyper = bool(modifiers & KEYMOD_HYPER);
+  _key_pressed = (modifiers & KEYMOD_RELEASED) == 0;
+  _key_shift = (modifiers & KEYMOD_SHIFT) != 0;
+  _key_ctrl = (modifiers & KEYMOD_CTRL) != 0;
+  _key_alt = (modifiers & KEYMOD_ALT) != 0;
+  _key_meta = (modifiers & KEYMOD_META) != 0;
+  _key_super = (modifiers & KEYMOD_SUPER) != 0;
+  _key_hyper = (modifiers & KEYMOD_HYPER) != 0;
   _key_event->fireValueChanged();
   if (_key_code < 0)
     return;
@@ -512,8 +512,8 @@ FGInput::_init_joystick ()
             << "\"\nUsing default: \"" << source << '"');
 
       } else {
-        throw sg_throwable(string("No joystick configuration file with "
-            "<name>default</name> entry found!"));
+        throw sg_exception(string("No joystick configuration file with <name>")
+                           + name + "</name> entry found!");
       }
 
       js_node = js_nodes->getChild("js", i, true);
@@ -901,7 +901,8 @@ FGInput::_update_mouse ( double dt )
   if ( fgGetBool( "/sim/mouse/hide-cursor", true ) ) {
       if ( m.x != m.save_x || m.y != m.save_y ) {
           m.timeout = fgGetDouble( "/sim/mouse/cursor-timeout-sec", 10.0 );
-          fgSetMouseCursor(m.modes[mode].cursor);
+          if (fgGetMouseCursor() == MOUSE_CURSOR_NONE)
+              fgSetMouseCursor(m.modes[mode].cursor);
       } else {
           m.timeout -= dt;
           if ( m.timeout <= 0.0 ) {