From 4e03d03391a5c1c36d86b0cdeaa7a76a26565153 Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Fri, 21 Jan 2005 23:09:24 +0000 Subject: [PATCH] fix handleUnexpectedMsgType for non OTP server --- direct/src/distributed/ClientRepository.py | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py index c19a375e74..0249bbea85 100644 --- a/direct/src/distributed/ClientRepository.py +++ b/direct/src/distributed/ClientRepository.py @@ -591,30 +591,31 @@ class ClientRepository(ConnectionRepository.ConnectionRepository): self.send(obj.dclass.clientFormatGenerate(obj, id, zone, [])) def handleUnexpectedMsgType(self, msgType, di): - if msgType == CLIENT_CREATE_OBJECT_REQUIRED: - self.handleGenerateWithRequired(di) - elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER: - self.handleGenerateWithRequiredOther(di) - elif msgType == CLIENT_OBJECT_UPDATE_FIELD: - self.handleUpdateField(di) - elif msgType == CLIENT_OBJECT_DISABLE_RESP: - self.handleDisable(di) - elif msgType == CLIENT_OBJECT_DELETE_RESP: - self.handleDelete(di) - elif msgType == CLIENT_GO_GET_LOST: + if msgType == CLIENT_GO_GET_LOST: self.handleGoGetLost(di) elif msgType == CLIENT_HEARTBEAT: self.handleServerHeartbeat(di) - elif msgType == CLIENT_SYSTEM_MESSAGE: - self.handleSystemMessage(di) - elif wantOtpServer and msgType == CLIENT_CREATE_OBJECT_REQUIRED: - self.handleGenerateWithRequired(di) - elif wantOtpServer and msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER: - self.handleGenerateWithRequiredOther(di) - elif wantOtpServer and msgType == CLIENT_DONE_SET_ZONE_RESP: - self.handleSetZoneDone() - elif wantOtpServer and msgType == CLIENT_OBJECT_LOCATION: - self.handleObjectLocation(di) + elif wantOtpServer: + if msgType == CLIENT_CREATE_OBJECT_REQUIRED: + self.handleGenerateWithRequired(di) + elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER: + self.handleGenerateWithRequiredOther(di) + elif msgType == CLIENT_OBJECT_UPDATE_FIELD: + self.handleUpdateField(di) + elif msgType == CLIENT_OBJECT_DISABLE_RESP: + self.handleDisable(di) + elif msgType == CLIENT_OBJECT_DELETE_RESP: + self.handleDelete(di) + elif msgType == CLIENT_SYSTEM_MESSAGE: + self.handleSystemMessage(di) + elif msgType == CLIENT_CREATE_OBJECT_REQUIRED: + self.handleGenerateWithRequired(di) + elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER: + self.handleGenerateWithRequiredOther(di) + elif msgType == CLIENT_DONE_SET_ZONE_RESP: + self.handleSetZoneDone() + elif msgType == CLIENT_OBJECT_LOCATION: + self.handleObjectLocation(di) else: currentLoginState = self.loginFSM.getCurrentState() if currentLoginState: