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

Lots of bugs fixed

Browse Source 
- MISSILETRAINER: is working now...
SET_CLIENT. Is working much better now. Had to rework DATABASE, SPAWN to
get this straight.
BASE: Fixed a bug that has been in de system for a very long time. the
parent should have never been deepcopied when inheriting from it.
- SCHEDULER: Fixed a nasty bug with the scheduler, when the
repeatparameters was nil, i was still repeating, very wrong. fixed now.
This commit is contained in:
FlightControl
2016-06-11 10:28:57 +02:00
parent bd81d16327
commit b335e99d5b
26 changed files with 215 additions and 40051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Moose Development/Moose/Scheduler.lua
View File

@@ -49,8 +49,10 @@ function SCHEDULER:New( TimeEventObject, TimeEventFunction, TimeEventFunctionArg
if RepeatSecondsInterval then
self.RepeatSecondsInterval = RepeatSecondsInterval
self.Repeat = true
else
self.RepeatSecondsInterval = 0
self.Repeat = false
end
if RandomizationFactor then
@@ -63,7 +65,6 @@ function SCHEDULER:New( TimeEventObject, TimeEventFunction, TimeEventFunctionArg
self.StopSeconds = StopSeconds
end
self.Repeat = false
self.StartTime = timer.getTime()
@@ -78,7 +79,6 @@ end
function SCHEDULER:Start()
self:F2( self.TimeEventObject )
self.Repeat = true
timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
return self
@@ -115,14 +115,16 @@ function SCHEDULER:_Scheduler()
Status, Result = xpcall( function() return self.TimeEventFunction( unpack( self.TimeEventFunctionArguments ) ) end, ErrorHandler )
end
self:T( { Status, Result } )
self:T( { Status, Result, self.StartTime, self.RepeatSecondsInterval, self.RandomizationFactor, self.StopSeconds } )
if Status and ( ( not Result == nil ) or ( Result and Result ~= false ) ) then
if Status and ( ( Result == nil ) or ( Result and Result ~= false ) ) then
if self.Repeat and ( not self.StopSeconds or ( self.StopSeconds and timer.getTime() <= self.StartTime + self.StopSeconds ) ) then
local ScheduleTime = timer.getTime() + self.RepeatSecondsInterval + math.random( - ( self.RandomizationFactor * self.RepeatSecondsInterval / 2 ), ( self.RandomizationFactor * self.RepeatSecondsInterval / 2 ) ) + 0.01
self:T( { timer.getTime(), ScheduleTime } )
timer.scheduleFunction(
self._Scheduler,
self,
timer.getTime() + self.RepeatSecondsInterval + math.random( - ( self.RandomizationFactor * self.RepeatSecondsInterval / 2 ), ( self.RandomizationFactor * self.RepeatSecondsInterval / 2 ) ) + 0.01
ScheduleTime
)
end
end