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

Updates

Browse Source
This commit is contained in:
FlightControl 2017-05-04 14:23:10 +02:00
parent a499c04fa4
commit 5bb91646d7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Core/Menu.lua
View File

@ -91,7 +91,7 @@ do -- MENU_BASE
-- @param #boolean RemoveParent If true, the parent menu is automatically removed when this menu is the last child menu of that parent @{Menu}. -- @param #boolean RemoveParent If true, the parent menu is automatically removed when this menu is the last child menu of that parent @{Menu}.
-- @return #MENU_BASE -- @return #MENU_BASE
function MENU_BASE:SetRemoveParent( RemoveParent ) function MENU_BASE:SetRemoveParent( RemoveParent )
self:F( { RemoveParent } ) self:F2( { RemoveParent } )
self.MenuRemoveParent = RemoveParent self.MenuRemoveParent = RemoveParent
return self return self
end end
@ -902,7 +902,7 @@ do
if self.ParentMenu and self.ParentMenu.Menus then if self.ParentMenu and self.ParentMenu.Menus then
self.ParentMenu.Menus[MenuText] = self self.ParentMenu.Menus[MenuText] = self
self.ParentMenu.MenuCount = self.ParentMenu.MenuCount + 1 self.ParentMenu.MenuCount = self.ParentMenu.MenuCount + 1
self:F( { ParentMenu.Menus, MenuText } ) self:F2( { ParentMenu.Menus, MenuText } )
end end
end end

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

@ -724,7 +724,12 @@ end
-- @param #TASK self -- @param #TASK self
function TASK:MenuTaskAbort( TaskGroup ) function TASK:MenuTaskAbort( TaskGroup )
self:Abort() for PlayerUnitName, PlayerUnit in pairs( TaskGroup:GetUnits() ) do
self:AbortUnit( PlayerUnit )
end
self:GetMission():GetCommandCenter():GetPositionable():MessageToSetGroup( "Abort", 15, self.SetGroup )
end end