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
This commit is contained in:
Applevangelist 2024-04-18 14:52:21 +02:00
commit 202d649085
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1009,7 +1009,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
self.Templates.Groups[GroupTemplateName].CategoryID = CategoryID self.Templates.Groups[GroupTemplateName].CategoryID = CategoryID
self.Templates.Groups[GroupTemplateName].CoalitionID = CoalitionSide self.Templates.Groups[GroupTemplateName].CoalitionID = CoalitionSide
self.Templates.Groups[GroupTemplateName].CountryID = CountryID self.Templates.Groups[GroupTemplateName].CountryID = CountryID
local UnitNames = {} local UnitNames = {}
for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do
@ -1074,7 +1074,7 @@ end
-- @param #string unitname Name of the associated unit. -- @param #string unitname Name of the associated unit.
-- @return #number Octal -- @return #number Octal
function DATABASE:GetNextSTN(octal,unitname) function DATABASE:GetNextSTN(octal,unitname)
local first = UTILS.OctalToDecimal(octal) local first = UTILS.OctalToDecimal(octal) or 0
if self.STNS[first] == unitname then return octal end if self.STNS[first] == unitname then return octal end
local nextoctal = 77777 local nextoctal = 77777
local found = false local found = false
@ -1111,7 +1111,7 @@ end
-- @param #string unitname Name of the associated unit. -- @param #string unitname Name of the associated unit.
-- @return #number Octal -- @return #number Octal
function DATABASE:GetNextSADL(octal,unitname) function DATABASE:GetNextSADL(octal,unitname)
local first = UTILS.OctalToDecimal(octal) local first = UTILS.OctalToDecimal(octal) or 0
if self.SADL[first] == unitname then return octal end if self.SADL[first] == unitname then return octal end
local nextoctal = 7777 local nextoctal = 7777
local found = false local found = false
@ -2081,7 +2081,7 @@ function DATABASE:_RegisterTemplates()
for group_num, Template in pairs(obj_type_data.group) do for group_num, Template in pairs(obj_type_data.group) do
if obj_type_name ~= "static" and Template and Template.units and type(Template.units) == 'table' then --making sure again- this is a valid group if obj_type_name ~= "static" and Template and Template.units and type(Template.units) == 'table' then --making sure again- this is a valid group
self:_RegisterGroupTemplate(Template, CoalitionSide, _DATABASECategory[string.lower(CategoryName)], CountryID) self:_RegisterGroupTemplate(Template, CoalitionSide, _DATABASECategory[string.lower(CategoryName)], CountryID)
else else