weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into FlightControl

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2017-03-05 09:52:13 +01:00
commit 8905a49d0c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Moose Development/Moose/Core/Set.lua
View File

@ -591,7 +591,7 @@ function SET_BASE:_EventOnBirth( Event )
if Event.IniDCSUnit then if Event.IniDCSUnit then
local ObjectName, Object = self:AddInDatabase( Event ) local ObjectName, Object = self:AddInDatabase( Event )
self:T3( ObjectName, Object ) self:T3( ObjectName, Object )
if self:IsIncludeObject( Object ) then if Object and self:IsIncludeObject( Object ) then
self:Add( ObjectName, Object ) self:Add( ObjectName, Object )
--self:_EventOnPlayerEnterUnit( Event ) --self:_EventOnPlayerEnterUnit( Event )
end end
@ -962,9 +962,11 @@ end
function SET_GROUP:AddInDatabase( Event ) function SET_GROUP:AddInDatabase( Event )
self:F3( { Event } ) self:F3( { Event } )
if not self.Database[Event.IniDCSGroupName] then if Event.IniObjectCategory == 1 then
self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) if not self.Database[Event.IniDCSGroupName] then
self:T3( self.Database[Event.IniDCSGroupName] ) self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName )
self:T3( self.Database[Event.IniDCSGroupName] )
end
end end
return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName] return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName]
@ -1387,9 +1389,11 @@ end
function SET_UNIT:AddInDatabase( Event ) function SET_UNIT:AddInDatabase( Event )
self:F3( { Event } ) self:F3( { Event } )
if not self.Database[Event.IniDCSUnitName] then if Event.IniObjectCategory == 1 then
self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) if not self.Database[Event.IniDCSUnitName] then
self:T3( self.Database[Event.IniDCSUnitName] ) self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName )
self:T3( self.Database[Event.IniDCSUnitName] )
end
end end
return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName] return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName]