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 branch 'FF/Ops' into FF/OpsDev

Browse Source
This commit is contained in:
Frank 2023-09-05 20:53:45 +02:00
commit 8f0c6948ac
2 changed files with 63 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Moose Development/Moose/Core/ClientMenu.lua
View File

@ -35,6 +35,7 @@
-- @field #string lid Lid for log entries -- @field #string lid Lid for log entries
-- @field #string version Version string -- @field #string version Version string
-- @field #string name Name -- @field #string name Name
-- @field #string groupname Group name
-- @field #table path -- @field #table path
-- @field #table parentpath -- @field #table parentpath
-- @field #CLIENTMENU Parent -- @field #CLIENTMENU Parent
@ -57,7 +58,7 @@
CLIENTMENU = { CLIENTMENU = {
ClassName = "CLIENTMENUE", ClassName = "CLIENTMENUE",
lid = "", lid = "",
version = "0.1.0", version = "0.1.1",
name = nil, name = nil,
path = nil, path = nil,
group = nil, group = nil,
@ -68,6 +69,7 @@ CLIENTMENU = {
Generic = false, Generic = false,
debug = false, debug = false,
Controller = nil, Controller = nil,
groupname = nil,
} }
--- ---
@ -91,6 +93,7 @@ function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
self.group = Client:GetGroup() self.group = Client:GetGroup()
self.client = Client self.client = Client
self.GroupID = self.group:GetID() self.GroupID = self.group:GetID()
self.groupname = self.group:GetName() or "Unknown Groupname"
else else
self.Generic = true self.Generic = true
end end
@ -190,7 +193,10 @@ function CLIENTMENU:RemoveF10()
self:T(self.lid.."RemoveF10") self:T(self.lid.."RemoveF10")
if self.GroupID then if self.GroupID then
--self:I(self.lid.."Removing "..table.concat(self.path,";")) --self:I(self.lid.."Removing "..table.concat(self.path,";"))
missionCommands.removeItemForGroup(self.GroupID , self.path ) local status, err = pcall(missionCommands.removeItemForGroup(self.GroupID , self.path ))
if not status then
self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname))
end
end end
return self return self
end end

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

@ -14792,6 +14792,7 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
end end
else else
-- SRS transmission -- SRS transmission
if call.subtitle ~= nil and string.len(call.subtitle) > 1 then if call.subtitle ~= nil and string.len(call.subtitle) > 1 then
@ -14853,6 +14854,7 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
local srstext = self:_GetNiceSRSText(text) local srstext = self:_GetNiceSRSText(text)
self.SRSQ:NewTransmission(srstext, call.duration, self.SRS, tstart, 0.1, subgroups, call.subtitle, call.subduration, frequency, modulation, gender, culture, voice, volume, radio.alias) self.SRSQ:NewTransmission(srstext, call.duration, self.SRS, tstart, 0.1, subgroups, call.subtitle, call.subduration, frequency, modulation, gender, culture, voice, volume, radio.alias)
end end
end
end end
--- Set SRS voice for the pilot calls. --- Set SRS voice for the pilot calls.