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 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
This commit is contained in:
Applevangelist
2023-10-17 11:08:13 +02:00
parent 3f04249d07 65f9db8efa
commit e578a673d9
4 changed files with 311 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Ops/ATIS.lua
View File

@@ -1524,7 +1524,7 @@ end
-- @param #string GoogleKey Path to Google JSON-Key.
-- @return #ATIS self
function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port, GoogleKey)
if PathToSRS then
if PathToSRS or MSRS.path then
self.useSRS=true
self.msrs=MSRS:New(PathToSRS, self.frequency, self.modulation)
self.msrs:SetGender(Gender)
@@ -1555,7 +1555,7 @@ end
--- Get the coalition of the associated airbase.
-- @param #ATIS self
-- @return #number Coalition of the associcated airbase.
-- @return #number Coalition of the associated airbase.
function ATIS:GetCoalition()
local coal = self.airbase and self.airbase:GetCoalition() or nil
return coal