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

Improvements

Browse Source
This commit is contained in:
FlightControl
2017-04-26 22:34:17 +02:00
parent 979bc8cf8b
commit 858670ab80
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Moose Development/Moose/Tasking/Task.lua
View File

@@ -283,7 +283,6 @@ function TASK:AbortUnit( PlayerUnit )
if #PlayerGroup:GetUnits() == 1 then
self:UnAssignFromGroup( PlayerGroup )
PlayerGroup:SetState( PlayerGroup, "Assigned", nil )
self:RemoveMenuForGroup( PlayerGroup )
end
self:Abort()
self:PlayerAborted( PlayerUnit )
@@ -322,7 +321,6 @@ function TASK:CrashUnit( PlayerUnit )
self:E( { TaskGroup = PlayerGroup:GetName(), GetUnits = PlayerGroup:GetUnits() } )
if #PlayerGroup:GetUnits() == 1 then
PlayerGroup:SetState( PlayerGroup, "Assigned", nil )
self:RemoveMenuForGroup( PlayerGroup )
end
self:PlayerCrashed( PlayerUnit )
end
@@ -357,17 +355,18 @@ end
-- @param Wrapper.Group#GROUP TaskGroup
-- @return #TASK
function TASK:AssignToGroup( TaskGroup )
self:F2( TaskGroup:GetName() )
self:F( TaskGroup:GetName() )
local TaskGroupName = TaskGroup:GetName()
TaskGroup:SetState( TaskGroup, "Assigned", self )
self:E("Task is assigned to " .. TaskGroup:GetName() )
local Mission = self:GetMission()
local MissionMenu = Mission:GetMenu( TaskGroup )
MissionMenu:RemoveSubMenus()
--self:RemoveMenuForGroup( TaskGroup )
self:SetAssignedMenuForGroup( TaskGroup )
local TaskUnits = TaskGroup:GetUnits()
@@ -482,6 +481,8 @@ function TASK:UnAssignFromGroup( TaskGroup )
TaskGroup:SetState( TaskGroup, "Assigned", nil )
self:E("Task is unassigned from " .. TaskGroup:GetName() )
self:RemoveAssignedMenuForGroup( TaskGroup )
local TaskUnits = TaskGroup:GetUnits()