Reduce spurious output from joystick.cxx

Fix a typo in JSBSim.cxx (#endif in wrong place)

diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index 1aa232627726c0c7dbc549d7925821cb8b145fe1..1ce30fa79911605b85c560472e9bd0c7f4ee5b11 100644 (file)
--- a/src/Joystick/joystick.cxx
+++ b/src/Joystick/joystick.cxx
@@ -438,9 +438,8 @@ fgJoystickRead()
                    flag = b.value->setDoubleValue(b.step);
                    break;
                case button::ADJUST:
-                   if (!b.value->setDoubleValue(b.value->getDoubleValue() + b.step))
-                       FG_LOG(FG_INPUT, FG_ALERT, "Failed to set value for joystick "
-                              << i << ", axis " << j);
+                   flag = b.value->setDoubleValue(b.value->getDoubleValue() +
+                                                  b.step);
                    break;
                default:
                    flag = false;

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 314e3678bfc08a5a1440c785c40df089802657bf..12dbb3abd511a09d783d139673061e478530b57b 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -186,6 +186,8 @@ bool FGTileMgr::current_elev_ssg( sgdVec3 abs_view_pos, double *terrain_elev ) {
        scenery.cur_radius = geoc.radius();
        sgVec3 tmp;
        sgSetVec3(tmp, hit_list.get_normal(this_hit));
+       // cout << "cur_normal: " << tmp[0] << " " << tmp[1] << " "
+       //      << tmp[2] << endl;
        ssgState *IntersectedLeafState =
            ((ssgLeaf*)hit_list.get_entity(this_hit))->getState();
        CurrentNormalInLocalPlane(tmp, tmp);