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

Merge pull request #24 from FlightControl-Master/Add-variable-parameters-to-Alive-function-for-CLIENTS

Browse Source 
Add variable parameters to alive function for clients
This commit is contained in:
Sven Van de Velde 2016-04-24 07:50:20 +02:00
commit 92bf378a1c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Embedded/Moose_Embedded.lua
View File

@ -7533,11 +7533,12 @@ end
-- @param #CLIENT self -- @param #CLIENT self
-- @param #function CallBack Function. -- @param #function CallBack Function.
-- @return #CLIENT -- @return #CLIENT
function CLIENT:Alive( CallBack ) function CLIENT:Alive( CallBack, ... )
self:F() self:F()
self.ClientAlive2 = false self.ClientAlive2 = false
self.ClientCallBack = CallBack self.ClientCallBack = CallBack
self.ClientParameters = arg
self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 ) self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 )
return self return self
@ -7592,7 +7593,7 @@ function CLIENT:_AliveCheckScheduler()
if self:IsAlive() then if self:IsAlive() then
if self.ClientAlive2 == false then if self.ClientAlive2 == false then
self:T("Calling Callback function") self:T("Calling Callback function")
self.ClientCallBack( self ) self.ClientCallBack( self, unpack( self.ClientParameters ) )
self.ClientAlive2 = true self.ClientAlive2 = true
end end
else else

5
Moose/Client.lua
View File

@ -91,11 +91,12 @@ end
-- @param #CLIENT self -- @param #CLIENT self
-- @param #function CallBack Function. -- @param #function CallBack Function.
-- @return #CLIENT -- @return #CLIENT
function CLIENT:Alive( CallBack ) function CLIENT:Alive( CallBack, ... )
self:F() self:F()
self.ClientAlive2 = false self.ClientAlive2 = false
self.ClientCallBack = CallBack self.ClientCallBack = CallBack
self.ClientParameters = arg
self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 ) self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 )
return self return self
@ -150,7 +151,7 @@ function CLIENT:_AliveCheckScheduler()
if self:IsAlive() then if self:IsAlive() then
if self.ClientAlive2 == false then if self.ClientAlive2 == false then
self:T("Calling Callback function") self:T("Calling Callback function")
self.ClientCallBack( self ) self.ClientCallBack( self, unpack( self.ClientParameters ) )
self.ClientAlive2 = true self.ClientAlive2 = true
end end
else else