From c25f0e36073777d7a410aaf2db074bf54f979f9b Mon Sep 17 00:00:00 2001 From: Greg Wiatroski Date: Tue, 18 Oct 2005 23:43:38 +0000 Subject: [PATCH] Barrier -> ToonBarrier from karting brnahc (bad form?) --- direct/src/distributed/DistributedObjectAI.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py index 7ff14ff807..c67999ef09 100644 --- a/direct/src/distributed/DistributedObjectAI.py +++ b/direct/src/distributed/DistributedObjectAI.py @@ -55,7 +55,7 @@ class DistributedObjectAI(DirectObject): """ print out doId(parentId,zoneId) className and conditionally show generated, disabled, neverDisable, - or cachable" + or cachable """ spaces=' '*(indent+2) try: @@ -433,7 +433,7 @@ class DistributedObjectAI(DirectObject): # simultaneously on different lists of avatars, although they # should have different names. - from otp.ai import Barrier + from toontown.ai import ToonBarrier context = self.__nextBarrierContext # We assume the context number is passed as a uint16. self.__nextBarrierContext = (self.__nextBarrierContext + 1) & 0xffff @@ -441,7 +441,7 @@ class DistributedObjectAI(DirectObject): assert(self.notify.debug('beginBarrier(%s, %s, %s, %s)' % (context, name, avIds, timeout))) if avIds: - barrier = Barrier.Barrier( + barrier = ToonBarrier.ToonBarrier( name, self.uniqueName(name), avIds, timeout, doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback)) self.__barriers[context] = barrier