fly/flightgear
1
0
Fork 0
Code Activity

small cleanup to vivian's patch

Browse source
This commit is contained in:
Tim Moore 2009-12-09 09:23:20 +01:00
parent 3922c12163
commit 582a95f0cb
6 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
projects/VC7.1/FlightGear.vcproj
View file

@ -2729,6 +2729,13 @@
<File <File
RelativePath="..\..\src\AIModel\AICarrier.hxx"> RelativePath="..\..\src\AIModel\AICarrier.hxx">
</File> </File>
<File
RelativePath="..\..\src\AIModel\AIEscort.cxx">
</File>
<File
RelativePath="..\..\src\AIModel\AIEscort.hxx">
</File>
<File <File
RelativePath="..\..\src\AIModel\AIFlightPlan.cxx"> RelativePath="..\..\src\AIModel\AIFlightPlan.cxx">
</File> </File>

8
projects/VC90/FlightGear/FlightGear.vcproj
View file

@ -3901,6 +3901,14 @@
RelativePath="..\..\..\src\AIModel\AICarrier.hxx" RelativePath="..\..\..\src\AIModel\AICarrier.hxx"
> >
</File> </File>
<File
RelativePath="..\..\..\src\AIModel\AIEscort.cxx"
>
</File>
<File
RelativePath="..\..\..\src\AIModel\AIEscort.hxx"
>
</File>
<File <File
RelativePath="..\..\..\src\AIModel\AIFlightPlan.cxx" RelativePath="..\..\..\src\AIModel\AIFlightPlan.cxx"
> >

2
src/AIModel/AIEscort.cxx
View file

@ -39,6 +39,8 @@
#include "AIEscort.hxx" #include "AIEscort.hxx"
using std::string;
FGAIEscort::FGAIEscort() : FGAIEscort::FGAIEscort() :
FGAIShip(otEscort), FGAIShip(otEscort),

7
src/AIModel/AIEscort.hxx
View file

@ -26,9 +26,6 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
using std::string;
using std::list;
#include "AIBase.hxx" #include "AIBase.hxx"
#include "AIShip.hxx" #include "AIShip.hxx"
@ -53,7 +50,7 @@ private:
virtual void reinit() { init(); } virtual void reinit() { init(); }
virtual void update (double dt); virtual void update (double dt);
void setParentName(const string& p); void setParentName(const std::string& p);
void setParent(); void setParent();
void setStnRange(double r); void setStnRange(double r);
void setStnBrg(double y); void setStnBrg(double y);
@ -102,7 +99,7 @@ private:
bool _MPControl, _patrol, _stn_deg_true; bool _MPControl, _patrol, _stn_deg_true;
string _parent; std::string _parent;
}; };

20
src/Instrumentation/wxradar.cxx
View file

@ -73,16 +73,16 @@ static const char *DEFAULT_FONT = "typewriter.txf";
wxRadarBg::wxRadarBg(SGPropertyNode *node) : wxRadarBg::wxRadarBg(SGPropertyNode *node) :
_name(node->getStringValue("name", "radar")), _name(node->getStringValue("name", "radar")),
_num(node->getIntValue("number", 0)), _num(node->getIntValue("number", 0)),
_interval(node->getDoubleValue("update-interval-sec", 1.0)), _interval(node->getDoubleValue("update-interval-sec", 1.0)),
_time(0.0), _time(0.0),
_sim_init_done(false), _sim_init_done(false),
_odg(0), _odg(0),
_last_switchKnob("off"), _last_switchKnob("off"),
_resultTexture(0), _resultTexture(0),
_wxEcho(0), _wxEcho(0),
_antenna_ht(node->getDoubleValue("antenna-ht-ft", 0.0)) _antenna_ht(node->getDoubleValue("antenna-ht-ft", 0.0))
{ {
string branch; string branch;
branch = "/instrumentation/" + _name; branch = "/instrumentation/" + _name;

2
src/Instrumentation/wxradar.hxx
View file

@ -33,11 +33,9 @@
#include <simgear/environment/visual_enviro.hxx> #include <simgear/environment/visual_enviro.hxx>
#include <vector> #include <vector>
#include <queue>
#include <string> #include <string>
using std::vector; using std::vector;
using std::queue;
using std::string; using std::string;
class FGODGauge; class FGODGauge;