fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'patch' into next

Browse source
This commit is contained in:
ThorstenB 2010-10-29 21:18:15 +02:00
commit 58cf5a12a0
5 changed files with 7 additions and 7 deletions

6
src/AIModel/AIBallistic.cxx
View file

@ -41,10 +41,12 @@ const double FGAIBallistic::slugs_to_lbs = 32.1740485564;
FGAIBallistic::FGAIBallistic(object_type ot) : FGAIBallistic::FGAIBallistic(object_type ot) :
FGAIBase(ot), FGAIBase(ot),
_height(0.0), _height(0.0),
_speed(0),
_ht_agl_ft(0.0), _ht_agl_ft(0.0),
_azimuth(0.0), _azimuth(0.0),
_elevation(0.0), _elevation(0.0),
_rotation(0.0), _rotation(0.0),
hs(0),
_elapsed_time(0), _elapsed_time(0),
_aero_stabilised(false), _aero_stabilised(false),
_drag_area(0.007), _drag_area(0.007),
@ -65,9 +67,7 @@ _report_impact(false),
_external_force(false), _external_force(false),
_report_expiry(false), _report_expiry(false),
_impact_report_node(fgGetNode("/ai/models/model-impact", true)), _impact_report_node(fgGetNode("/ai/models/model-impact", true)),
hs(0), _old_height(0)
_old_height(0),
_speed(0)
{ {
no_roll = false; no_roll = false;

2
src/AIModel/AIWingman.cxx
View file

@ -29,9 +29,9 @@
FGAIWingman::FGAIWingman() : FGAIBallistic(otWingman), FGAIWingman::FGAIWingman() : FGAIBallistic(otWingman),
_formate_to_ac(true), _formate_to_ac(true),
_break_angle(-90),
_break(false), _break(false),
_join(false), _join(false),
_break_angle(-90),
_coeff_hdg(5.0), _coeff_hdg(5.0),
_coeff_pch(5.0), _coeff_pch(5.0),
_coeff_bnk(5.0), _coeff_bnk(5.0),

2
src/Instrumentation/KLN89/kln89.cxx
View file

@ -867,7 +867,7 @@ int KLN89::GetLabelQuadrant(double h1, double h2) {
while(h2 < 0.0) h2 += 360.0; while(h2 < 0.0) h2 += 360.0;
while(h2 > 360.0) h2 -= 360.0; while(h2 > 360.0) h2 -= 360.0;
double max_min_diff = 0.0; double max_min_diff = 0.0;
int quad; int quad = 1;
for(int i=0; i<4; ++i) { for(int i=0; i<4; ++i) {
double h = 45 + (90 * i); double h = 45 + (90 * i);
double diff1 = fabs(h - h1); double diff1 = fabs(h - h1);

2
src/Instrumentation/dclgps.cxx
View file

@ -635,7 +635,7 @@ void DCLGPS::update(double dt) {
*/ */
string DCLGPS::ExpandSIAPIdent(const string& ident) { string DCLGPS::ExpandSIAPIdent(const string& ident) {
string name; string name;
bool has_rwy; bool has_rwy = false;
switch(ident[0]) { switch(ident[0]) {
case 'N': name = "NDB or GPS"; has_rwy = false; break; case 'N': name = "NDB or GPS"; has_rwy = false; break;

2
src/Main/fg_os_osgviewer.cxx
View file

@ -102,7 +102,7 @@ static osg::ref_ptr<osg::Camera> mainCamera;
static void setStereoMode( const char * mode ) static void setStereoMode( const char * mode )
{ {
DisplaySettings::StereoMode stereoMode; DisplaySettings::StereoMode stereoMode = DisplaySettings::QUAD_BUFFER;
bool stereoOn = true; bool stereoOn = true;
if (strcmp(mode,"QUAD_BUFFER")==0) if (strcmp(mode,"QUAD_BUFFER")==0)