fly/flightgear
1
0
Fork 0
Code Activity

MSVC compatibility changes and code tweaks for minor nits caught by the

Browse source 
MSVC compiler.
This commit is contained in:
curt 2000-10-02 21:49:04 +00:00
parent df26bde4c4
commit 1dc35581f5
26 changed files with 146 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Airports/simple.cxx
View file

@ -194,7 +194,7 @@ bool FGAirportsUtil::dump_mk4( const string& file ) {
c4_Row row;
iterator current = airports.begin();
const_iterator current = airports.begin();
const_iterator end = airports.end();
while ( current != end ) {
// add each airport record

2
src/Cockpit/hud.hxx
View file

@ -28,6 +28,8 @@
# error This library requires C++
#endif
#include <simgear/compiler.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif

5
src/Cockpit/panel_io.cxx
View file

@ -638,7 +638,8 @@ readInstrument (SGPropertyNode node, int x, int y, int real_w, int real_h)
//
SGPropertyNode action_group = node.getSubNode("actions");
int nActions = action_group.size();
for (int j = 0; j < nActions; j++) {
int j;
for (j = 0; j < nActions; j++) {
FGPanelAction * action = readAction(action_group.getChild(j),
hscale, vscale);
if (action == 0) {
@ -653,7 +654,7 @@ readInstrument (SGPropertyNode node, int x, int y, int real_w, int real_h)
//
SGPropertyNode layer_group = node.getSubNode("layers");
int nLayers = layer_group.size();
for (int j = 0; j < nLayers; j++) {
for (j = 0; j < nLayers; j++) {
FGInstrumentLayer * layer = readLayer(layer_group.getChild(j),
hscale, vscale);
if (layer == 0) {

58
src/Controls/controls.hxx
View file

@ -57,6 +57,8 @@ private:
double rudder;
double flaps;
double throttle[MAX_ENGINES];
double mixture[MAX_ENGINES];
double prop_advance[MAX_ENGINES];
double brake[MAX_WHEELS];
bool throttle_idle;
@ -80,6 +82,10 @@ public:
inline double get_rudder() const { return rudder; }
inline double get_flaps() const { return flaps; }
inline double get_throttle(int engine) const { return throttle[engine]; }
inline double get_mixture(int engine) const { return mixture[engine]; }
inline double get_prop_advance(int engine) const {
return prop_advance[engine];
}
inline double get_brake(int wheel) const { return brake[wheel]; }
// Update functions
@ -163,6 +169,58 @@ public:
}
}
}
inline void set_mixture( int engine, double pos ) {
if ( engine == ALL_ENGINES ) {
for ( int i = 0; i < MAX_ENGINES; i++ ) {
mixture[i] = pos;
CLAMP( &mixture[i], 0.0, 1.0 );
}
} else {
if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
mixture[engine] = pos;
CLAMP( &mixture[engine], 0.0, 1.0 );
}
}
}
inline void move_mixture( int engine, double amt ) {
if ( engine == ALL_ENGINES ) {
for ( int i = 0; i < MAX_ENGINES; i++ ) {
mixture[i] += amt;
CLAMP( &mixture[i], 0.0, 1.0 );
}
} else {
if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
mixture[engine] += amt;
CLAMP( &mixture[engine], 0.0, 1.0 );
}
}
}
inline void set_prop_advance( int engine, double pos ) {
if ( engine == ALL_ENGINES ) {
for ( int i = 0; i < MAX_ENGINES; i++ ) {
prop_advance[i] = pos;
CLAMP( &prop_advance[i], 0.0, 1.0 );
}
} else {
if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
prop_advance[engine] = pos;
CLAMP( &prop_advance[engine], 0.0, 1.0 );
}
}
}
inline void move_prop_advance( int engine, double amt ) {
if ( engine == ALL_ENGINES ) {
for ( int i = 0; i < MAX_ENGINES; i++ ) {
prop_advance[i] += amt;
CLAMP( &prop_advance[i], 0.0, 1.0 );
}
} else {
if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
prop_advance[engine] += amt;
CLAMP( &prop_advance[engine], 0.0, 1.0 );
}
}
}
inline void set_brake( int wheel, double pos ) {
if ( wheel == ALL_WHEELS ) {
for ( int i = 0; i < MAX_WHEELS; i++ ) {

6
src/FDM/10520d.cxx
View file

@ -47,11 +47,15 @@
// INCLUDES
// ------------------------------------------------------------------------
#include <iostream.h>
#include <simgear/compiler.h>
#include <iostream>
#include <math.h>
#include "10520d.hxx"
FG_USING_STD(cout);
FG_USING_STD(endl);
// ------------------------------------------------------------------------
// CODE

2
src/FDM/10520d.hxx
View file

@ -51,7 +51,7 @@
#define _10520D_HXX_
#include <iostream.h>
#include <iostream>
#include <math.h>

7
src/FDM/IO360.cxx
View file

@ -72,12 +72,15 @@
//
//////////////////////////////////////////////////////////////////////
#include <iostream.h>
#include <fstream.h>
#include <simgear/compiler.h>
#include <iostream>
#include <fstream>
#include <math.h>
#include "IO360.hxx"
FG_USING_STD(cout);
// ------------------------------------------------------------------------
// CODE

6
src/FDM/IO360.hxx
View file

@ -56,11 +56,13 @@
#define PHILS_PROP_MODEL
#endif
#include <simgear/compiler.h>
#include <iostream.h>
#include <fstream.h>
#include <iostream>
#include <fstream>
#include <math.h>
FG_USING_STD(ofstream);
class FGEngine {

6
src/FDM/UIUCModel/uiuc_1DdataFileReader.h
View file

@ -1,11 +1,13 @@
#ifndef _1D_DATA_FILE_READER_H_
#define _1D_DATA_FILE_READER_H_
#include <strstream.h>
#include <simgear/compiler.h>
#include <strstream>
#include "uiuc_parsefile.h"
#include "uiuc_aircraft.h"
int uiuc_1DdataFileReader( string file_name,
double x[100],
double y[100],

5
src/FDM/UIUCModel/uiuc_2DdataFileReader.h
View file

@ -1,7 +1,10 @@
#ifndef _2D_DATA_FILE_READER_H_
#define _2D_DATA_FILE_READER_H_
#include <strstream.h>
#include <simgear/compiler.h>
#include <strstream>
#include "uiuc_parsefile.h"
#include "uiuc_aircraft.h"

3
src/FDM/UIUCModel/uiuc_aircraft.h
View file

@ -94,8 +94,11 @@
#define _AIRCRAFT_H_
#include <simgear/compiler.h>
#include <map>
#include <iostream>
#include <math.h>
#include "uiuc_parsefile.h"
FG_USING_STD(map);

2
src/FDM/UIUCModel/uiuc_controlInput.cpp
View file

@ -66,7 +66,7 @@
**********************************************************************/
#include "uiuc_controlInput.h"
#include <iostream.h>
#include <iostream>
void uiuc_controlInput()
{

7
src/FDM/UIUCModel/uiuc_controlInput.h
View file

@ -4,8 +4,15 @@
#include "uiuc_aircraft.h"
#include "uiuc_1Dinterpolation.h"
#ifdef __cplusplus
extern "C" {
#endif
extern double Simtime;
#ifdef __cplusplus
}
#endif
void uiuc_controlInput();

7
src/FDM/UIUCModel/uiuc_ice.h
View file

@ -3,8 +3,15 @@
#include "uiuc_aircraft.h"
#ifdef __cplusplus
extern "C" {
#endif
extern double Simtime;
#ifdef __cplusplus
}
#endif
void uiuc_ice_eta();

8
src/FDM/UIUCModel/uiuc_menu.cpp
View file

@ -89,8 +89,14 @@
**********************************************************************/
#include <simgear/compiler.h>
#include "uiuc_menu.h"
#include <iostream.h>
#include <iostream>
FG_USING_STD(cerr);
FG_USING_STD(cout);
FG_USING_STD(endl);
bool check_float(string &token)
{

4
src/FDM/UIUCModel/uiuc_parsefile.h
View file

@ -1,12 +1,12 @@
#ifndef _PARSE_FILE_H_
#define _PARSE_FILE_H_
#include <simgear/compiler.h>
#include <string>
#include <list>
#include <fstream>
#include <simgear/compiler.h>
FG_USING_STD(list);
FG_USING_STD(string);
FG_USING_STD(ifstream);

8
src/FDM/UIUCModel/uiuc_recorder.h
View file

@ -8,8 +8,16 @@
#include <FDM/LaRCsim/ls_cockpit.h>
#include <FDM/LaRCsim/ls_constants.h>
#ifdef __cplusplus
extern "C" {
#endif
extern double Simtime;
#ifdef __cplusplus
}
#endif
void uiuc_recorder(double dt );
#endif //_RECORDER_H

4
src/FDM/UIUCModel/uiuc_warnings_errors.h
View file

@ -1,10 +1,12 @@
#ifndef _WARNINGS_ERRORS_H_
#define _WARNINGS_ERRORS_H_
#include <simgear/compiler.h>
#include <string>
#include <iostream>
using std::string;
FG_USING_STD(string);
void uiuc_warnings_errors(int errorCode, string line);

5
src/FDM/UIUCModel/uiuc_wrapper.cpp
View file

@ -63,6 +63,8 @@
**********************************************************************/
#include <simgear/compiler.h>
#include "uiuc_aircraft.h"
#include "uiuc_aircraftdir.h"
#include "uiuc_coefficients.h"
@ -73,6 +75,9 @@
#include "uiuc_betaprobe.h"
#include <FDM/LaRCsim/ls_generic.h>
FG_USING_STD(cout);
FG_USING_STD(endl);
extern "C" void uiuc_init_aeromodel ();
extern "C" void uiuc_force_moment(double dt);
extern "C" void uiuc_engine_routine();

2
src/FDM/flight.hxx
View file

@ -949,7 +949,7 @@ public:
}
inline void add_engine( FGEngInterface e ) {
return engines.push_back( e );
engines.push_back( e );
}
};

9
src/FDM/ps-10520c.cxx
View file

@ -49,10 +49,13 @@
// INCLUDES
// ------------------------------------------------------------------------
#include <iostream.h>
// #include <stdio.h>
#include <simgear/compiler.h>
#include <iostream>
#include <math.h>
// #include "10520c.h"
FG_USING_STD(cout);
FG_USING_STD(endl);
// ------------------------------------------------------------------------
// CODE

4
src/Joystick/joystick.cxx
View file

@ -21,6 +21,7 @@
//
// $Id$
#include <simgear/compiler.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
@ -39,7 +40,8 @@
#include <plib/js.h>
#include "joystick.hxx"
using std::string;
FG_USING_STD(string);
FG_USING_STD(cout);
#ifdef WIN32
static const int MAX_JOYSTICKS = 2;

2
src/Main/bfi.cxx
View file

@ -124,7 +124,7 @@ FGBFI::init ()
getRoll, setRoll);
// Engine
current_properties.tieDouble("/engine0/rpm",
current_properties.tieDouble("/engines/engine0/rpm",
getRPM, setRPM);
// Velocities

1
src/Main/save.cxx
View file

@ -20,6 +20,7 @@
//
// $Id$
#include <simgear/compiler.h>
#ifdef HAVE_CONFIG_H
# include <config.h>

1
src/Main/views.cxx
View file

@ -21,6 +21,7 @@
//
// $Id$
#include <simgear/compiler.h>
#ifdef HAVE_CONFIG_H
# include <config.h>

4
src/Network/props.cxx
View file

@ -26,10 +26,12 @@
#include <simgear/io/iochannel.hxx>
#include <simgear/math/sg_types.hxx>
#include <strstream.h>
#include <strstream>
#include "props.hxx"
FG_USING_STD(cout);
FG_USING_STD(istrstream);
FGProps::FGProps() {
}