From 62b476144a644ff008c3e829c71f1360dd9afd82 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Wed, 30 Nov 2016 15:22:24 +0100 Subject: [PATCH] Removed the Init function --- Moose Development/Moose/Process/Account.lua | 23 +++++++-------------- Moose Development/Moose/Process/Route.lua | 17 ++++++--------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Moose Development/Moose/Process/Account.lua b/Moose Development/Moose/Process/Account.lua index 7b2257204..4fc0774e7 100644 --- a/Moose Development/Moose/Process/Account.lua +++ b/Moose Development/Moose/Process/Account.lua @@ -107,20 +107,6 @@ do -- PROCESS_ACCOUNT return self end - --- Creates a new DESTROY process. - -- @param #PROCESS_ACCOUNT self - -- @return #PROCESS_ACCOUNT - function PROCESS_ACCOUNT:Init() - - self.DisplayInterval = 30 - self.DisplayCount = 30 - self.DisplayMessage = true - self.DisplayTime = 10 -- 10 seconds is the default - self.DisplayCategory = "HQ" -- Targets is the default display category - - return self - end - --- Process Events --- StateMachine callback function @@ -130,7 +116,14 @@ do -- PROCESS_ACCOUNT -- @param #string From -- @param #string To function PROCESS_ACCOUNT:onafterStart( ProcessUnit, Event, From, To ) - + + -- TODO: need to generalize the timing. + self.DisplayInterval = 30 + self.DisplayCount = 30 + self.DisplayMessage = true + self.DisplayTime = 10 -- 10 seconds is the default + self.DisplayCategory = "HQ" -- Targets is the default display category + self:EventOnDead( self.EventDead ) self:__Wait( 1 ) diff --git a/Moose Development/Moose/Process/Route.lua b/Moose Development/Moose/Process/Route.lua index ac743b19c..bd9ed812b 100644 --- a/Moose Development/Moose/Process/Route.lua +++ b/Moose Development/Moose/Process/Route.lua @@ -115,17 +115,6 @@ do -- PROCESS_ROUTE return self end - function PROCESS_ROUTE:Init() - - self.DisplayInterval = 30 - self.DisplayCount = 30 - self.DisplayMessage = true - self.DisplayTime = 10 -- 10 seconds is the default - self.DisplayCategory = "HQ" -- Route is the default display category - - return self - end - --- Task Events --- StateMachine callback function @@ -136,6 +125,12 @@ do -- PROCESS_ROUTE -- @param #string To function PROCESS_ROUTE:onafterStart( ProcessUnit, Event, From, To ) + self.DisplayInterval = 30 + self.DisplayCount = 30 + self.DisplayMessage = true + self.DisplayTime = 10 -- 10 seconds is the default + self.DisplayCategory = "HQ" -- Route is the default display category + self:__Route( 1 ) end