FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Applevangelist 2023-09-13 15:31:50 +02:00
commit fc44894bc0
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Moose Development/Moose/Ops/Airboss.lua
View File

@ -11592,14 +11592,8 @@ function AIRBOSS:GetHeadingIntoWind( magnetic, coord )
-- Get direction the wind is blowing from. This is where we want to go.
local windfrom, vwind = self:GetWind( nil, nil, coord )
--self:T("windfrom="..windfrom.." vwind="..vwind)
vwind = vwind + adjustDegreesForWindSpeed(vwind)
--self:T("windfrom="..windfrom.." (c)vwind="..vwind)
-- Actually, we want the runway in the wind.
local intowind = windfrom - self.carrierparam.rwyangle
local intowind = windfrom - self.carrierparam.rwyangle + adjustDegreesForWindSpeed(vwind)
-- If no wind, take current heading.
if vwind < 0.1 then

2
Moose Development/Moose/Sound/SRS.lua
View File

@ -192,7 +192,7 @@ MSRS = {
MSRS.version="0.1.2"
--- Voices
-- @type Voices
-- @type MSRS.Voices
MSRS.Voices = {
Microsoft = {
["Hedda"] = "Microsoft Hedda Desktop", -- de-DE