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

xxx

Browse Source
This commit is contained in:
Applevangelist 2024-05-27 17:07:12 +02:00
parent 2657c3aa52
commit 97635f4bba
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
-- --
-- @module Core.ClientMenu -- @module Core.ClientMenu
-- @image Core_Menu.JPG -- @image Core_Menu.JPG
-- last change: Apr 2024 -- last change: May 2024
-- TODO -- TODO
---------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------
@ -691,7 +691,7 @@ function CLIENTMENUMANAGER:Propagate(Client)
local client = _client -- Wrapper.Client#CLIENT local client = _client -- Wrapper.Client#CLIENT
if client and client:IsAlive() then if client and client:IsAlive() then
local playerunit = client:GetName() local playerunit = client:GetName()
local playergroup = client:GetGroup() --local playergroup = client:GetGroup()
local playername = client:GetPlayerName() or "none" local playername = client:GetPlayerName() or "none"
if not knownunits[playerunit] then if not knownunits[playerunit] then
knownunits[playerunit] = true knownunits[playerunit] = true

1
Moose Development/Moose/Core/Menu.lua
View File

@ -1050,6 +1050,7 @@ do
-- @param #MENU_GROUP_DELAYED self -- @param #MENU_GROUP_DELAYED self
-- @return #MENU_GROUP_DELAYED -- @return #MENU_GROUP_DELAYED
function MENU_GROUP_DELAYED:Set() function MENU_GROUP_DELAYED:Set()
if not self.GroupID then return end
do do
if not self.MenuSet then if not self.MenuSet then
missionCommands.addSubMenuForGroup( self.GroupID, self.MenuText, self.MenuParentPath ) missionCommands.addSubMenuForGroup( self.GroupID, self.MenuText, self.MenuParentPath )

10
Moose Development/Moose/Ops/PlayerTask.lua
View File

@ -2123,10 +2123,12 @@ function PLAYERTASKCONTROLLER:_GetPlayerName(Client)
local ttsplayername = nil local ttsplayername = nil
if not self.customcallsigns[playername] then if not self.customcallsigns[playername] then
local playergroup = Client:GetGroup() local playergroup = Client:GetGroup()
ttsplayername = playergroup:GetCustomCallSign(self.ShortCallsign,self.Keepnumber,self.CallsignTranslations) if playergroup ~= nil then
local newplayername = self:_GetTextForSpeech(ttsplayername) ttsplayername = playergroup:GetCustomCallSign(self.ShortCallsign,self.Keepnumber,self.CallsignTranslations)
self.customcallsigns[playername] = newplayername local newplayername = self:_GetTextForSpeech(ttsplayername)
ttsplayername = newplayername self.customcallsigns[playername] = newplayername
ttsplayername = newplayername
end
else else
ttsplayername = self.customcallsigns[playername] ttsplayername = self.customcallsigns[playername]
end end