Barrier -> ToonBarrier from karting brnahc (bad form?)

This commit is contained in:
Greg Wiatroski 2005-10-18 23:43:38 +00:00
parent 62fbd49535
commit c25f0e3607

View File

@ -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