TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

use OTP barrier instead of toontown

Browse Source
This commit is contained in:
Samir Naik 2005-10-05 00:28:14 +00:00
parent 4ceb6ccb17
commit be64a3bd8a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/distributed/DistributedObjectAI.py
View File

@ -433,7 +433,7 @@ class DistributedObjectAI(DirectObject):
# simultaneously on different lists of avatars, although they # simultaneously on different lists of avatars, although they
# should have different names. # should have different names.
from toontown.ai import ToonBarrier from otp.ai import Barrier
context = self.__nextBarrierContext context = self.__nextBarrierContext
# We assume the context number is passed as a uint16. # We assume the context number is passed as a uint16.
self.__nextBarrierContext = (self.__nextBarrierContext + 1) & 0xffff 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))) assert(self.notify.debug('beginBarrier(%s, %s, %s, %s)' % (context, name, avIds, timeout)))
if avIds: if avIds:
barrier = ToonBarrier.ToonBarrier( barrier = Barrier.Barrier(
name, self.uniqueName(name), avIds, timeout, name, self.uniqueName(name), avIds, timeout,
doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback)) doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback))
self.__barriers[context] = barrier self.__barriers[context] = barrier

4
direct/src/distributed/DistributedObjectUD.py
View File

@ -428,7 +428,7 @@ class DistributedObjectUD(DirectObject):
# simultaneously on different lists of avatars, although they # simultaneously on different lists of avatars, although they
# should have different names. # should have different names.
from toontown.ai import ToonBarrier from otp.ai import Barrier
context = self.__nextBarrierContext context = self.__nextBarrierContext
# We assume the context number is passed as a uint16. # We assume the context number is passed as a uint16.
self.__nextBarrierContext = (self.__nextBarrierContext + 1) & 0xffff 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))) assert(self.notify.debug('beginBarrier(%s, %s, %s, %s)' % (context, name, avIds, timeout)))
if avIds: if avIds:
barrier = ToonBarrier.ToonBarrier( barrier = Barrier.Barrier(
name, self.uniqueName(name), avIds, timeout, name, self.uniqueName(name), avIds, timeout,
doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback)) doneFunc = PythonUtil.Functor(self.__barrierCallback, context, callback))
self.__barriers[context] = barrier self.__barriers[context] = barrier