weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-25 04:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Apple/Develop' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Utilities/Profiler.lua
This commit is contained in:
Applevangelist
2022-09-06 10:43:48 +02:00
parent 8cceee49ea 34ff03936a
commit a437da76ec
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Core/Database.lua
+10
View File
@@ -1593,6 +1593,16 @@ function DATABASE:_RegisterTemplates()
local CategoryName = obj_type_name local CategoryName = obj_type_name
if ((type( obj_type_data ) == 'table') and obj_type_data.group and (type( obj_type_data.group ) == 'table') and (#obj_type_data.group > 0)) then -- there's a group!
-- self.Units[coa_name][countryName][category] = {}
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
self:_RegisterGroupTemplate( Template, CoalitionSide, _DATABASECategory[string.lower( CategoryName )], CountryID )
if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group!
--self.Units[coa_name][countryName][category] = {} --self.Units[coa_name][countryName][category] = {}
Moose Development/Moose/Utilities/Profiler.lua
+2
View File
@@ -281,6 +281,8 @@ end
-- @return #string Source file name. -- @return #string Source file name.
-- @return #string Line number. -- @return #string Line number.
-- @return #number Function time in seconds. -- @return #number Function time in seconds.
function PROFILER.getData( func )
function PROFILER.getData(func) function PROFILER.getData(func)
local n=PROFILER.dInfo[func] local n=PROFILER.dInfo[func]
Moose Development/Moose/Utilities/Utils.lua
-1
View File
@@ -2468,4 +2468,3 @@ function UTILS.ToStringBRAANATO(FromGrp,ToGrp)
end end
end end
return BRAANATO return BRAANATO
end