From f071c674d06f3340203cbdb3ed2779af7794a4d7 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Wed, 22 Nov 2023 18:35:23 +0100 Subject: [PATCH 1/2] fix --- Moose Development/Moose/Sound/SRS.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 951dda27b..fe659a1da 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -1266,7 +1266,7 @@ function MSRS:LoadConfigFile(Path,Filename) MSRS.gender = MSRS_Config.Gender or "male" MSRS.google = MSRS_Config.Google if MSRS_Config.Provider then - self.ttsprovider = MSRS_Config.Provider + MSRS.ttsprovider = MSRS_Config.Provider end MSRS.Label = MSRS_Config.Label or "MSRS" MSRS.voice = MSRS_Config.Voice --or MSRS.Voices.Microsoft.Hazel From bbf793febe3663ed59dbbf0016be813fc907125a Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 23 Nov 2023 17:01:33 +0100 Subject: [PATCH 2/2] #CLIENTMENU --- Moose Development/Moose/Core/ClientMenu.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Core/ClientMenu.lua b/Moose Development/Moose/Core/ClientMenu.lua index 7d4fecde6..525b3533d 100644 --- a/Moose Development/Moose/Core/ClientMenu.lua +++ b/Moose Development/Moose/Core/ClientMenu.lua @@ -396,7 +396,7 @@ end CLIENTMENUMANAGER = { ClassName = "CLIENTMENUMANAGER", lid = "", - version = "0.1.3", + version = "0.1.4", name = nil, clientset = nil, menutree = {}, @@ -439,18 +439,18 @@ function CLIENTMENUMANAGER:_EventHandler(EventData) --self:I(self.lid.."_EventHandler: "..tostring(EventData.IniPlayerName)) if EventData.id == EVENTS.PlayerLeaveUnit or EventData.id == EVENTS.Ejection or EventData.id == EVENTS.Crash or EventData.id == EVENTS.PilotDead then self:T(self.lid.."Leave event for player: "..tostring(EventData.IniPlayerName)) - local Client = _DATABASE:FindClient( EventData.IniPlayerName ) + local Client = _DATABASE:FindClient( EventData.IniUnitName ) if Client then self:ResetMenu(Client) end elseif (EventData.id == EVENTS.PlayerEnterAircraft) and EventData.IniCoalition == self.Coalition then if EventData.IniPlayerName and EventData.IniGroup then - if (not self.clientset:IsIncludeObject(_DATABASE:FindClient( EventData.IniPlayerName ))) then + if (not self.clientset:IsIncludeObject(_DATABASE:FindClient( EventData.IniUnitName ))) then self:T(self.lid.."Client not in SET: "..EventData.IniPlayerName) return self end --self:I(self.lid.."Join event for player: "..EventData.IniPlayerName) - local player = _DATABASE:FindClient( EventData.IniPlayerName ) + local player = _DATABASE:FindClient( EventData.IniUnitName ) self:Propagate(player) end elseif EventData.id == EVENTS.PlayerEnterUnit then @@ -668,7 +668,7 @@ function CLIENTMENUMANAGER:Propagate(Client) for _,_client in pairs(Set) do local client = _client -- Wrapper.Client#CLIENT if client and client:IsAlive() then - local playername = client:GetPlayerName() + local playername = client:GetPlayerName() or "none" if not self.playertree[playername] then self.playertree[playername] = {} end