fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'maint' into next

Browse source
This commit is contained in:
Tim Moore 2009-01-26 09:49:07 +01:00
commit 0c5e9f46e7
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/Win32-Inno/FlightGear-1.9.iss
View file

@ -20,18 +20,18 @@
[Setup] [Setup]
AppName=FlightGear AppName=FlightGear
OutputBaseFilename=fgsetup-1.9.0 OutputBaseFilename=fgsetup-1.9.1
AppVerName=FlightGear v1.9.0 AppVerName=FlightGear v1.9.1
AppPublisher=The FlightGear Organization AppPublisher=The FlightGear Organization
AppPublisherURL=http://www.flightgear.org AppPublisherURL=http://www.flightgear.org
AppSupportURL=http://www.flightgear.org AppSupportURL=http://www.flightgear.org
AppUpdatesURL=http://www.flightgear.org AppUpdatesURL=http://www.flightgear.org
DefaultDirName={pf}\FlightGear DefaultDirName={pf}\FlightGear
DefaultGroupName=FlightGear v1.9.0 DefaultGroupName=FlightGear v1.9.1
LicenseFile=X:\data\COPYING LicenseFile=X:\data\COPYING
Uninstallable=yes Uninstallable=yes
SetupIconFile=x:\flightgear.ico SetupIconFile=x:\flightgear.ico
VersionInfoVersion=1.9.0.0 VersionInfoVersion=1.9.1.0
WizardImageFile=X:\setupimg.bmp WizardImageFile=X:\setupimg.bmp
WizardSmallImageFile=X:\setupsmall.bmp WizardSmallImageFile=X:\setupsmall.bmp
@ -53,7 +53,7 @@ Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; Work
Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf" Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf"
Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html" Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html"
Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org" Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
Name: "{userdesktop}\FlightGear v1.9.0"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon Name: "{userdesktop}\FlightGear v1.9.1"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}"; Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}";
Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}"; Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}";
@ -69,7 +69,7 @@ Name: "{group}\Tools\yasim"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\
Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs" Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs"
; For running flightgear directly ; For running flightgear directly
; Name: "{userdesktop}\FlightGear v1.9.0"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}"; Tasks: desktopicon ; Name: "{userdesktop}\FlightGear v1.9.1"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}"; Tasks: desktopicon
[Run] [Run]
; Put installation directory into the fgrun.prefs ; Put installation directory into the fgrun.prefs

18
src/Environment/environment_ctrl.cxx
View file

@ -438,15 +438,19 @@ FGMetarEnvironmentCtrl::update_env_config ()
// factor by the maximum wind change. // factor by the maximum wind change.
double x = fabs(current[0] - metar[0]); double x = fabs(current[0] - metar[0]);
double y = fabs(current[1] - metar[1]); double y = fabs(current[1] - metar[1]);
double dx = x / (x + y);
double dy = 1 - dx;
double maxdx = dx * MaxWindChangeKtsSec; // only interpolate if we have a difference
double maxdy = dy * MaxWindChangeKtsSec; if (x + y > 0) {
double dx = x / (x + y);
double dy = 1 - dx;
// Interpolate each component separately. double maxdx = dx * MaxWindChangeKtsSec;
current[0] = interpolate_val(current[0], metar[0], maxdx); double maxdy = dy * MaxWindChangeKtsSec;
current[1] = interpolate_val(current[1], metar[1], maxdy);
// Interpolate each component separately.
current[0] = interpolate_val(current[0], metar[0], maxdx);
current[1] = interpolate_val(current[1], metar[1], maxdy);
}
// Now convert back to polar coordinates. // Now convert back to polar coordinates.
if ((current[0] == 0.0) && (current[1] == 0.0)) { if ((current[0] == 0.0) && (current[1] == 0.0)) {

1
src/Instrumentation/altimeter.cxx
View file

@ -47,6 +47,7 @@ Altimeter::init ()
SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true ); SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
raw_PA = 0.0; raw_PA = 0.0;
_kollsman = 0.0;
_pressure_node = fgGetNode(_static_pressure.c_str(), true); _pressure_node = fgGetNode(_static_pressure.c_str(), true);
_serviceable_node = node->getChild("serviceable", 0, true); _serviceable_node = node->getChild("serviceable", 0, true);
_setting_node = node->getChild("setting-inhg", 0, true); _setting_node = node->getChild("setting-inhg", 0, true);