From d594cb7dde73087a74e2dccd8fb3379a5dce0fc6 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Mon, 5 May 2008 21:57:14 +0000 Subject: [PATCH] fixed getTasks and getDoLaters to exclude removed tasks, renamed stepping() to setStepping() so it isn't overwritten by 'stepping' instance member variable --- direct/src/task/Task.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py index eb48deb128..483f8db728 100644 --- a/direct/src/task/Task.py +++ b/direct/src/task/Task.py @@ -402,7 +402,7 @@ class TaskManager: self.add(self.__doLaterProcessor, "doLaterProcessor", -10) - def stepping(self, value): + def setStepping(self, value): self.stepping = value def setVerbose(self, value): @@ -1111,16 +1111,18 @@ class TaskManager: tasks = [] for taskPriList in self.taskList: for task in taskPriList: - if task is not None: + if task is not None and not task._removed: tasks.append(task) for pri, taskList in self.pendingTaskDict.iteritems(): for task in taskList: - tasks.append(task) + if not task._removed: + tasks.append(task) return tasks def getDoLaters(self): # returns list of all doLaters in arbitrary order - return self.__doLaterList[:] + return [doLater for doLater in self.__doLaterList + if not doLater._removed] def resetStats(self): # WARNING: this screws up your do-later timings