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 branch

Browse Source
This commit is contained in:
Applevangelist 2024-08-14 15:43:51 +02:00
commit 38e16dd07e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Core/Database.lua
View File

@ -1362,7 +1362,7 @@ function DATABASE:GetCoalitionFromClientTemplate( ClientName )
if self.Templates.ClientsByName[ClientName] then if self.Templates.ClientsByName[ClientName] then
return self.Templates.ClientsByName[ClientName].CoalitionID return self.Templates.ClientsByName[ClientName].CoalitionID
end end
self:E("ERROR: Template does not exist for client "..tostring(ClientName)) self:E("WARNING: Template does not exist for client "..tostring(ClientName))
return nil return nil
end end
@ -1374,7 +1374,7 @@ function DATABASE:GetCategoryFromClientTemplate( ClientName )
if self.Templates.ClientsByName[ClientName] then if self.Templates.ClientsByName[ClientName] then
return self.Templates.ClientsByName[ClientName].CategoryID return self.Templates.ClientsByName[ClientName].CategoryID
end end
self:E("ERROR: Template does not exist for client "..tostring(ClientName)) self:E("WARNING: Template does not exist for client "..tostring(ClientName))
return nil return nil
end end
@ -1386,7 +1386,7 @@ function DATABASE:GetCountryFromClientTemplate( ClientName )
if self.Templates.ClientsByName[ClientName] then if self.Templates.ClientsByName[ClientName] then
return self.Templates.ClientsByName[ClientName].CountryID return self.Templates.ClientsByName[ClientName].CountryID
end end
self:E("ERROR: Template does not exist for client "..tostring(ClientName)) self:E("WARNING: Template does not exist for client "..tostring(ClientName))
return nil return nil
end end

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

@ -305,7 +305,6 @@ MSRS.Voices = {
["en_IN_Ravi"] = "Ravi", --en-IN ["en_IN_Ravi"] = "Ravi", --en-IN
["en_IN_Heera"] = "Heera", --en-IN ["en_IN_Heera"] = "Heera", --en-IN
["en_IR_Sean"] = "Sean", --en-IR ["en_IR_Sean"] = "Sean", --en-IR
--]]
}, },
Google = { Google = {
Standard = { Standard = {