From daeeb3141fab04bea2a9936552e7bd6373011423 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Tue, 2 Aug 2005 20:59:14 +0000 Subject: [PATCH] no sendSetShardMsg in OTP --- direct/src/distributed/ClientRepository.py | 17 +++++++++-------- direct/src/distributed/MsgTypes.py | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py index b53b327c81..ce262ccaea 100644 --- a/direct/src/distributed/ClientRepository.py +++ b/direct/src/distributed/ClientRepository.py @@ -644,14 +644,15 @@ class ClientRepository(ConnectionRepository): # send the message self.send(datagram) - def sendSetShardMsg(self, shardId): - datagram = PyDatagram() - # Add message type - datagram.addUint16(CLIENT_SET_SHARD) - # Add shard id - datagram.addUint32(shardId) - # send the message - self.send(datagram) + if not wantOtpServer: + def sendSetShardMsg(self, shardId): + datagram = PyDatagram() + # Add message type + datagram.addUint16(CLIENT_SET_SHARD) + # Add shard id + datagram.addUint32(shardId) + # send the message + self.send(datagram) def getObjectsOfClass(self, objClass): """ returns dict of doId:object, containing all objects diff --git a/direct/src/distributed/MsgTypes.py b/direct/src/distributed/MsgTypes.py index e7b105f13d..652fe222f6 100644 --- a/direct/src/distributed/MsgTypes.py +++ b/direct/src/distributed/MsgTypes.py @@ -30,7 +30,8 @@ CLIENT_OBJECT_DELETE_RESP = 27 if not wantOtpServer: CLIENT_SET_ZONE = 29 CLIENT_REMOVE_ZONE = 30 -CLIENT_SET_SHARD = 31 +if not wantOtpServer: + CLIENT_SET_SHARD = 31 CLIENT_SET_AVATAR = 32 CLIENT_CREATE_OBJECT_REQUIRED = 34 CLIENT_CREATE_OBJECT_REQUIRED_RESP = 34