From f12b1f00ecb2c9876dcf68078e2261495c8ff01b Mon Sep 17 00:00:00 2001 From: fredb <fredb> Date: Sat, 27 Dec 2008 16:08:21 +0000 Subject: [PATCH 1/2] Remove warnings --- src/FDM/YASim/BodyEnvironment.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FDM/YASim/BodyEnvironment.hpp b/src/FDM/YASim/BodyEnvironment.hpp index 536b4ea40..0ff096a42 100644 --- a/src/FDM/YASim/BodyEnvironment.hpp +++ b/src/FDM/YASim/BodyEnvironment.hpp @@ -39,9 +39,9 @@ struct State { gpos[2] = tmp[2] + pos[2]; } void posGlobalToLocal(double* gpos, float *lpos) { - lpos[0] = gpos[0] - pos[0]; - lpos[1] = gpos[1] - pos[1]; - lpos[2] = gpos[2] - pos[2]; + lpos[0] = (float)(gpos[0] - pos[0]); + lpos[1] = (float)(gpos[1] - pos[1]); + lpos[2] = (float)(gpos[2] - pos[2]); Math::vmul33(orient, lpos, lpos); } void velLocalToGlobal(float* lvel, float *gvel) { @@ -53,9 +53,9 @@ struct State { void planeGlobalToLocal(double* gplane, float *lplane) { // First the normal vector transformed to local coordinates. - lplane[0] = -gplane[0]; - lplane[1] = -gplane[1]; - lplane[2] = -gplane[2]; + lplane[0] = (float)-gplane[0]; + lplane[1] = (float)-gplane[1]; + lplane[2] = (float)-gplane[2]; Math::vmul33(orient, lplane, lplane); // Then the distance from the plane to the Aircraft's origin. From 6ccc0b64efcd522509dfb4cee567a3a7bb847d15 Mon Sep 17 00:00:00 2001 From: fredb <fredb> Date: Sat, 27 Dec 2008 16:09:01 +0000 Subject: [PATCH 2/2] Win32 fixes --- src/AIModel/AIFlightPlanCreate.cxx | 5 +++++ src/AIModel/AIFlightPlanCreateCruise.cxx | 5 +++++ src/AIModel/AIFlightPlanCreatePushBack.cxx | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/AIModel/AIFlightPlanCreate.cxx b/src/AIModel/AIFlightPlanCreate.cxx index 04ae25103..7d414bed7 100644 --- a/src/AIModel/AIFlightPlanCreate.cxx +++ b/src/AIModel/AIFlightPlanCreate.cxx @@ -17,6 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * **************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "AIFlightPlan.hxx" #include <simgear/math/sg_geodesy.hxx> #include <Airports/runways.hxx> diff --git a/src/AIModel/AIFlightPlanCreateCruise.cxx b/src/AIModel/AIFlightPlanCreateCruise.cxx index a12241268..d38896b7c 100755 --- a/src/AIModel/AIFlightPlanCreateCruise.cxx +++ b/src/AIModel/AIFlightPlanCreateCruise.cxx @@ -18,6 +18,11 @@ * * **************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <fstream> #include <iostream> #include "AIFlightPlan.hxx" diff --git a/src/AIModel/AIFlightPlanCreatePushBack.cxx b/src/AIModel/AIFlightPlanCreatePushBack.cxx index 3707f2b91..3b9ade374 100644 --- a/src/AIModel/AIFlightPlanCreatePushBack.cxx +++ b/src/AIModel/AIFlightPlanCreatePushBack.cxx @@ -17,6 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * **************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "AIFlightPlan.hxx" #include <simgear/math/sg_geodesy.hxx> #include <Airports/runways.hxx>