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 'develop' into FF/Develop

Browse Source
This commit is contained in:
funkyfranky
2018-09-13 23:22:23 +02:00
parent 956d4fa248 3b630be4f4
commit fdfb5266b3
8 changed files with 160 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Moose Development/Moose/Wrapper/Group.lua
View File

@@ -274,7 +274,13 @@ end
-- @usage
-- -- Ship unit example: destroy the Ship silently.
-- Ship = GROUP:FindByName( "Ship" )
-- Ship:Destroy( true )
-- Ship:Destroy()
--
-- @usage
-- -- Destroy without event generation example.
-- Ship = GROUP:FindByName( "Boat" )
-- Ship:Destroy( false ) -- Don't generate an event upon destruction.
--
function GROUP:Destroy( GenerateEvent )
self:F2( self.GroupName )
@@ -288,7 +294,7 @@ function GROUP:Destroy( GenerateEvent )
else
self:CreateEventDead( timer.getTime(), UnitData )
end
elseif GenerateEvent==false then
elseif GenerateEvent == false then
-- Do nothing!
else
self:CreateEventRemoveUnit( timer.getTime(), UnitData )
@@ -1528,8 +1534,6 @@ function GROUP:RespawnAtCurrentAirbase(SpawnTemplate, Takeoff, Uncontrolled) --
-- Destroy old group.
self:Destroy(false)
--SCHEDULER:New(nil, DATABASE.Spawn, {_DATABASE, SpawnTemplate}, 0.00001)
_DATABASE:Spawn( SpawnTemplate )
-- Reset events.