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

Switched for Event and State Transition handlers the parameter order

Browse Source 
The parameters are now: From, Event, To
The old parameter order was: Event, From, To
This commit is contained in:
FlightControl
2016-12-20 09:24:19 +01:00
parent dc3ce7226e
commit cb993c4df5
71 changed files with 597 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Tasking/Mission.lua
View File

@@ -69,7 +69,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function MISSION:onbeforeComplete( Event, From, To )
function MISSION:onbeforeComplete( From, Event, To )
for TaskID, Task in pairs( self:GetTasks() ) do
local Task = Task -- Tasking.Task#TASK
@@ -85,7 +85,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function MISSION:onenterCompleted( Event, From, To )
function MISSION:onenterCompleted( From, Event, To )
self:GetCommandCenter():MessageToCoalition( "Mission " .. self:GetName() .. " has been completed! Good job guys!" )
end

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

@@ -869,7 +869,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function TASK:onenterAssigned( Event, From, To )
function TASK:onenterAssigned( From, Event, To )
self:E("Task Assigned")
@@ -883,7 +883,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function TASK:onenterSuccess( Event, From, To )
function TASK:onenterSuccess( From, Event, To )
self:E( "Task Success" )
@@ -900,7 +900,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function TASK:onenterAborted( Event, From, To )
function TASK:onenterAborted( From, Event, To )
self:E( "Task Aborted" )
@@ -914,7 +914,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function TASK:onenterFailed( Event, From, To )
function TASK:onenterFailed( From, Event, To )
self:E( "Task Failed" )
@@ -928,7 +928,7 @@ end
-- @param #string Event
-- @param #string From
-- @param #string To
function TASK:onstatechange( Event, From, To )
function TASK:onstatechange( From, Event, To )
if self:IsTrace() then
MESSAGE:New( "@ Task " .. self.TaskName .. " : " .. Event .. " changed to state " .. To, 2 ):ToAll()

2
Moose Development/Moose/Tasking/Task_Pickup.lua
View File

@@ -103,7 +103,7 @@ do -- TASK_PICKUP
-- @param #string From
-- @param #string To
-- @param Event#EVENTDATA Event
function TASK_PICKUP:OnNext( Fsm, Event, From, To, Event )
function TASK_PICKUP:OnNext( Fsm, From, Event, To, Event )
self:SetState( self, "State", To )