From 0ff04705bfeeac5dbc065b3f217e1069124a1f06 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Thu, 4 Aug 2005 20:41:52 +0000 Subject: [PATCH] got factories and mints working again in Toontown --- direct/src/distributed/ClientRepository.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py index ce262ccaea..790d3e2203 100644 --- a/direct/src/distributed/ClientRepository.py +++ b/direct/src/distributed/ClientRepository.py @@ -674,8 +674,8 @@ class ClientRepository(ConnectionRepository): return doDict if wantOtpServer: - def sendEmulateSetZone(self, zoneId, visibleZoneList=None, - parentIdin=None, event=None): + def sendEmulateSetZoneMsg(self, zoneId, visibleZoneList=None, + parentIdin=None, event=None): """ This Will Move The avatar and set an interest to that location .. """ @@ -683,11 +683,10 @@ class ClientRepository(ConnectionRepository): if parentId is None: parentId = base.localAvatar.defaultShard - MyAvID = base.localAvatar.doId - # move thwe avatar.. - self.sendSetLocation(MyAvID,parentId,zoneId) - # move the interest.. + # move the avatar + self.sendSetLocation(base.localAvatar.doId,parentId,zoneId) + # move the interest InterestZones = zoneId if visibleZoneList is not None: InterestZones = visibleZoneList @@ -734,6 +733,13 @@ class ClientRepository(ConnectionRepository): # send the message self.send(datagram) + assert self.setZonesRequested >= self.setZonesReceived + self.setZonesRequested += 1 + + # override if desired + def handleSetZoneDone(self): + pass + def handleDatagram(self, di): if self.notify.getDebug(): print "ClientRepository received datagram:"