mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
Barrier -> ToonBarrier from karting brnahc (bad form?)
This commit is contained in:
parent
62fbd49535
commit
c25f0e3607
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user