From 598cfefba47dbe086507005e16bf54c7946407c3 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sun, 24 Apr 2016 06:59:21 +0200 Subject: [PATCH 1/3] Added variable parameter to Alive function So that the client number can be given when the client is alive. --- Moose/Client.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Moose/Client.lua b/Moose/Client.lua index 45c270ae4..f3af9dbee 100644 --- a/Moose/Client.lua +++ b/Moose/Client.lua @@ -91,11 +91,12 @@ end -- @param #CLIENT self -- @param #function CallBack Function. -- @return #CLIENT -function CLIENT:Alive( CallBack ) +function CLIENT:Alive( CallBack, ... ) self:F() self.ClientAlive2 = false self.ClientCallBack = CallBack + self.ClientParameters = arg self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 ) return self @@ -150,7 +151,7 @@ function CLIENT:_AliveCheckScheduler() if self:IsAlive() then if self.ClientAlive2 == false then self:T("Calling Callback function") - self.ClientCallBack( self ) + self.ClientCallBack( self, self.ClientParameters ) self.ClientAlive2 = true end else From 7893302d892a469a8ba4d3b0a9352a7f6beef80c Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sun, 24 Apr 2016 07:42:26 +0200 Subject: [PATCH 2/3] Updated variable parameters --- Moose/Client.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose/Client.lua b/Moose/Client.lua index f3af9dbee..5cb17fba3 100644 --- a/Moose/Client.lua +++ b/Moose/Client.lua @@ -151,7 +151,7 @@ function CLIENT:_AliveCheckScheduler() if self:IsAlive() then if self.ClientAlive2 == false then self:T("Calling Callback function") - self.ClientCallBack( self, self.ClientParameters ) + self.ClientCallBack( self, unpack( self.ClientParameters ) ) self.ClientAlive2 = true end else From 6fba093b77d7219e517a9b38607094d9c762fa5f Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sun, 24 Apr 2016 07:49:08 +0200 Subject: [PATCH 3/3] Embedded --- Embedded/Moose_Embedded.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Embedded/Moose_Embedded.lua b/Embedded/Moose_Embedded.lua index d53726370..93a3994b7 100644 --- a/Embedded/Moose_Embedded.lua +++ b/Embedded/Moose_Embedded.lua @@ -7533,11 +7533,12 @@ end -- @param #CLIENT self -- @param #function CallBack Function. -- @return #CLIENT -function CLIENT:Alive( CallBack ) +function CLIENT:Alive( CallBack, ... ) self:F() self.ClientAlive2 = false self.ClientCallBack = CallBack + self.ClientParameters = arg self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 ) return self @@ -7592,7 +7593,7 @@ function CLIENT:_AliveCheckScheduler() if self:IsAlive() then if self.ClientAlive2 == false then self:T("Calling Callback function") - self.ClientCallBack( self ) + self.ClientCallBack( self, unpack( self.ClientParameters ) ) self.ClientAlive2 = true end else