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

Downpatching changes from development to master

Browse Source
This commit is contained in:
Rolf Geuenich 2024-01-12 16:05:14 +01:00
parent 088436c5ce
commit bb07e1935e
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Moose Development/Moose/Functional/MissileTrainer.lua
View File

@ -72,7 +72,6 @@
-- @module Functional.MissileTrainer -- @module Functional.MissileTrainer
-- @image Missile_Trainer.JPG -- @image Missile_Trainer.JPG
--- ---
-- @type MISSILETRAINER -- @type MISSILETRAINER
-- @field Core.Set#SET_CLIENT DBClients -- @field Core.Set#SET_CLIENT DBClients

2
Moose Development/Moose/Functional/Warehouse.lua
View File

@ -87,7 +87,7 @@
-- @field #number respawndelay Delay before respawn in seconds. -- @field #number respawndelay Delay before respawn in seconds.
-- @field #number runwaydestroyed Time stamp timer.getAbsTime() when the runway was destroyed. -- @field #number runwaydestroyed Time stamp timer.getAbsTime() when the runway was destroyed.
-- @field #number runwayrepairtime Time in seconds until runway will be repaired after it was destroyed. Default is 3600 sec (one hour). -- @field #number runwayrepairtime Time in seconds until runway will be repaired after it was destroyed. Default is 3600 sec (one hour).
-- @field Ops.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse. -- @field OPS.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
-- @extends Core.Fsm#FSM -- @extends Core.Fsm#FSM
--- Have your assets at the right place at the right time - or not! --- Have your assets at the right place at the right time - or not!

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

@ -689,7 +689,15 @@ function GROUP:GetUnits()
local DCSUnits = DCSGroup:getUnits() or {} local DCSUnits = DCSGroup:getUnits() or {}
local Units = {} local Units = {}
for Index, UnitData in pairs( DCSUnits ) do for Index, UnitData in pairs( DCSUnits ) do
Units[#Units+1] = UNIT:Find( UnitData )
local unit=UNIT:Find( UnitData )
if unit then
Units[#Units+1] = UNIT:Find( UnitData )
else
local UnitName=UnitData:getName()
unit=_DATABASE:AddUnit(UnitName)
Units[#Units+1]=unit
end
end end
self:T3( Units ) self:T3( Units )
return Units return Units