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

Merged 'develop'.

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Cargo.lua
This commit is contained in:
FlightControl_Master
2018-03-28 13:49:57 +02:00
parent a15ef93e7c 2caada0119
commit 59bf7fdc96
7 changed files with 647 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,6 +224,7 @@ function UNIT:ReSpawn( SpawnVec3, Heading )
for UnitTemplateID, UnitTemplateData in pairs( SpawnGroupTemplate.units ) do
self:T( { UnitTemplateData.name, self:Name() } )
SpawnGroupTemplate.units[UnitTemplateID].unitId = nil
if UnitTemplateData.name == self:Name() then
self:T("Adjusting")
SpawnGroupTemplate.units[UnitTemplateID].alt = SpawnVec3.y
@@ -264,6 +265,8 @@ function UNIT:ReSpawn( SpawnVec3, Heading )
end
end
SpawnGroupTemplate.groupId = nil
self:T( SpawnGroupTemplate )
_DATABASE:Spawn( SpawnGroupTemplate )
@@ -383,7 +386,7 @@ function UNIT:GetGroup()
local DCSUnit = self:GetDCSObject()
if DCSUnit then
local UnitGroup = GROUP:Find( DCSUnit:getGroup() )
local UnitGroup = GROUP:FindByName( DCSUnit:getGroup():getName() )
return UnitGroup
end