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 branch 'master' into funkyfranky

Browse Source
This commit is contained in:
funkyfranky 2017-10-17 18:23:52 +02:00
commit f952cd4bb5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,9 @@ do -- UserFlag
-- --
function USERFLAG:Set( Number ) --R2.3 function USERFLAG:Set( Number ) --R2.3
trigger.misc.setUserFlag( self.UserFlagName ) self:F( { Number = Number } )
trigger.action.setUserFlag( self.UserFlagName, Number )
return self return self
end end
@ -68,7 +70,7 @@ do -- UserFlag
-- local BlueVictory = USERFLAG:New( "VictoryBlue" ) -- local BlueVictory = USERFLAG:New( "VictoryBlue" )
-- local BlueVictoryValue = BlueVictory:Get() -- Get the UserFlag VictoryBlue value. -- local BlueVictoryValue = BlueVictory:Get() -- Get the UserFlag VictoryBlue value.
-- --
function USERFLAG:Set( Number ) --R2.3 function USERFLAG:Get( Number ) --R2.3
return trigger.misc.getUserFlag( self.UserFlagName ) return trigger.misc.getUserFlag( self.UserFlagName )
end end

5
Moose Development/Moose/Wrapper/Unit.lua
View File

@ -168,7 +168,10 @@ function UNIT:Destroy()
local DCSObject = self:GetDCSObject() local DCSObject = self:GetDCSObject()
if DCSObject then if DCSObject then
USERFLAG:New( self:GetGroup():GetName() ):Set( 100 ) local UnitGroup = self:GetGroup()
local UnitGroupName = UnitGroup:GetName()
self:F( { UnitGroupName = UnitGroupName } )
USERFLAG:New( UnitGroupName ):Set( 100 )
--BASE:CreateEventCrash( timer.getTime(), DCSObject ) --BASE:CreateEventCrash( timer.getTime(), DCSObject )
DCSObject:destroy() DCSObject:destroy()
end end