From 1e049f24b0f4ccf644005eeaf6126b3ff5e7b69f Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Mon, 24 Aug 2009 17:56:39 +0200 Subject: [PATCH] fixes to remove warnings Comment out unused variables; fix a real bug in uiuc_gear(). --- src/FDM/UIUCModel/uiuc_gear.cpp | 6 ++++-- src/FDM/UIUCModel/uiuc_recorder.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/FDM/UIUCModel/uiuc_gear.cpp b/src/FDM/UIUCModel/uiuc_gear.cpp index f05c6211f..da120d29f 100644 --- a/src/FDM/UIUCModel/uiuc_gear.cpp +++ b/src/FDM/UIUCModel/uiuc_gear.cpp @@ -275,12 +275,14 @@ void uiuc_gear() clear3(f_wheel_local_v); reaction_normal_force=0; +#if 0 static const SGPropertyNode * gear_wow = fgGetNode("/gear/gear[0]/wow", false); static const SGPropertyNode * gear_wow1 = fgGetNode("/gear/gear[1]/wow", false); static const SGPropertyNode * gear_wow2 - = fgGetNode("/gear/gear[2]/wow", false); + = fgGetNode("/gear/gear[2]/wow", false); +#endif fgSetBool("/gear/gear[0]/wow", false); fgSetBool("/gear/gear[1]/wow", false); fgSetBool("/gear/gear[2]/wow", false); @@ -375,7 +377,7 @@ void uiuc_gear() cross3( d_wheel_cg_body_v, tempF, tempM ); /* Sum forces and moments across all wheels */ - if (tempF) { + if (tempF[0] != 0.0 || tempF[1] != 0.0 || tempF[2] != 0.0) { fgSetBool("/gear/gear[1]/wow", true); } diff --git a/src/FDM/UIUCModel/uiuc_recorder.cpp b/src/FDM/UIUCModel/uiuc_recorder.cpp index cd0ca2414..97e93b59c 100644 --- a/src/FDM/UIUCModel/uiuc_recorder.cpp +++ b/src/FDM/UIUCModel/uiuc_recorder.cpp @@ -105,11 +105,11 @@ void uiuc_recorder( double dt ) { stack command_list; string linetoken; - static int init = 0; + // static int init = 0; static int recordStep = 0; string record_variables = "# "; - int modulus = recordStep % recordRate; + // int modulus = recordStep % recordRate; //static double lat1; //static double long1;