From be64a3bd8aa3c678ff3011ff76e0066aaf62dc84 Mon Sep 17 00:00:00 2001 From: Samir Naik Date: Wed, 5 Oct 2005 00:28:14 +0000 Subject: [PATCH] use OTP barrier instead of toontown --- direct/src/distributed/DistributedObjectAI.py | 4 ++-- direct/src/distributed/DistributedObjectUD.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py index 5c11d79867..7ff14ff807 100644 --- a/direct/src/distributed/DistributedObjectAI.py +++ b/direct/src/distributed/DistributedObjectAI.py @@ -433,7 +433,7 @@ class DistributedObjectAI(DirectObject): # simultaneously on different lists of avatars, although they # should have different names. - from toontown.ai import ToonBarrier + from otp.ai import Barrier 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 = ToonBarrier.ToonBarrier( + barrier = Barrier.Barrier( name, self.uniqueName(name), avIds, timeout, doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback)) self.__barriers[context] = barrier diff --git a/direct/src/distributed/DistributedObjectUD.py b/direct/src/distributed/DistributedObjectUD.py index 8de9dac5aa..ae9f97022e 100755 --- a/direct/src/distributed/DistributedObjectUD.py +++ b/direct/src/distributed/DistributedObjectUD.py @@ -428,7 +428,7 @@ class DistributedObjectUD(DirectObject): # simultaneously on different lists of avatars, although they # should have different names. - from toontown.ai import ToonBarrier + from otp.ai import Barrier context = self.__nextBarrierContext # We assume the context number is passed as a uint16. self.__nextBarrierContext = (self.__nextBarrierContext + 1) & 0xffff @@ -436,7 +436,7 @@ class DistributedObjectUD(DirectObject): assert(self.notify.debug('beginBarrier(%s, %s, %s, %s)' % (context, name, avIds, timeout))) if avIds: - barrier = ToonBarrier.ToonBarrier( + barrier = Barrier.Barrier( name, self.uniqueName(name), avIds, timeout, doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback)) self.__barriers[context] = barrier