fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'maint' (early part) into next

Browse source
This commit is contained in:
Tim Moore 2009-01-18 23:21:11 +01:00
commit 552c3149ae
4 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
projects/VC7.1/fgjs.vcproj
View file

@ -34,10 +34,10 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="sg_d.lib js_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib" AdditionalDependencies="sg_d.lib js_d.lib ul_d.lib zlibd.lib winmm.lib ws2_32.lib OpenThreadsd.lib"
OutputFile="$(OutDir)/fgjs.exe" OutputFile="$(OutDir)/fgjs.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib" AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/fgjs.pdb" ProgramDatabaseFile="$(OutDir)/fgjs.pdb"
SubSystem="1" SubSystem="1"
@ -83,10 +83,10 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib" AdditionalDependencies="sg.lib js.lib ul.lib zlib.lib winmm.lib ws2_32.lib OpenThreads.lib"
OutputFile="$(OutDir)/fgjs.exe" OutputFile="$(OutDir)/fgjs.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\plib;..\..\..\3rdParty\lib" AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;..\..\..\3rdParty\lib"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

8
projects/VC7.1/terrasync.vcproj
View file

@ -33,10 +33,10 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ul_d.lib sg_d.lib net_d.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib" AdditionalDependencies="ul_d.lib sg_d.lib net_d.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib OpenThreadsd.lib"
OutputFile="$(OutDir)/terrasync.exe" OutputFile="$(OutDir)/terrasync.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\plib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;" AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/terrasync.pdb" ProgramDatabaseFile="$(OutDir)/terrasync.pdb"
SubSystem="1" SubSystem="1"
@ -82,10 +82,10 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ul.lib sg.lib net.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib" AdditionalDependencies="ul.lib sg.lib net.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib OpenThreads.lib"
OutputFile="$(OutDir)/terrasync.exe" OutputFile="$(OutDir)/terrasync.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\plib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;" AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib;&quot;..\..\..\svn-win32-1.5.3\lib&quot;;&quot;..\..\..\svn-win32-1.5.3\lib\apr&quot;"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

8
projects/VC7.1/yasim.vcproj
View file

@ -33,10 +33,10 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="sg_d.lib ul_d.lib" AdditionalDependencies="sg_d.lib ul_d.lib OpenThreadsd.lib"
OutputFile="$(OutDir)/yasim.exe" OutputFile="$(OutDir)/yasim.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\plib" AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/yasim.pdb" ProgramDatabaseFile="$(OutDir)/yasim.pdb"
SubSystem="1" SubSystem="1"
@ -82,10 +82,10 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="sg.lib ul.lib" AdditionalDependencies="sg.lib ul.lib OpenThreads.lib"
OutputFile="$(OutDir)/yasim.exe" OutputFile="$(OutDir)/yasim.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\plib" AdditionalLibraryDirectories="..\..\..\install\msvc71\OpenSceneGraph\lib;..\..\..\plib"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

17
src/Aircraft/controls.cxx
View file

@ -205,8 +205,10 @@ FGControls::init ()
magnetos[engine] = 0; magnetos[engine] = 0;
feed_tank[engine] = -1; // set to -1 to turn off all tanks 0 feeds all engines from center body tank feed_tank[engine] = -1; // set to -1 to turn off all tanks 0 feeds all engines from center body tank
starter[engine] = false; starter[engine] = false;
feather[engine] = false;
ignition[engine] = false; ignition[engine] = false;
fire_switch[engine] = false; fire_switch[engine] = false;
fire_bottle_discharge[engine] = false;
cutoff[engine] = true; cutoff[engine] = true;
augmentation[engine] = false; augmentation[engine] = false;
reverser[engine] = false; reverser[engine] = false;
@ -214,6 +216,21 @@ FGControls::init ()
nitrous_injection[engine] = false; nitrous_injection[engine] = false;
cowl_flaps_norm[engine] = 0.0; cowl_flaps_norm[engine] = 0.0;
condition[engine] = 1.0; condition[engine] = 1.0;
carb_heat[engine] = false;
inlet_heat[engine] = false;
generator_breaker[engine] = false;
bus_tie[engine] = false;
engine_bleed[engine] = false;
}
for ( int tank = 0; tank < MAX_TANKS; tank++ ) {
fuel_selector[tank] = false;
to_engine[tank] = 0;
to_tank[tank] = 0;
}
for( int pump = 0; pump < MAX_TANKS * MAX_BOOSTPUMPS; pump++ ) {
boost_pump[pump] = false;
} }
brake_left = brake_right brake_left = brake_right