diff --git a/dependencies/astron/astrond.exe b/dependencies/astron/astrond.exe index 4fdfc6dc..75ab02c0 100755 Binary files a/dependencies/astron/astrond.exe and b/dependencies/astron/astrond.exe differ diff --git a/dependencies/astron/mongoclient.dll b/dependencies/astron/mongoclient.dll deleted file mode 100644 index c06f12b3..00000000 Binary files a/dependencies/astron/mongoclient.dll and /dev/null differ diff --git a/dependencies/config/release/dev.prc b/dependencies/config/release/dev.prc index 2a5a03ef..b1db0ec3 100644 --- a/dependencies/config/release/dev.prc +++ b/dependencies/config/release/dev.prc @@ -25,8 +25,6 @@ accountdb-type developer shard-low-pop 50 shard-mid-pop 100 -game-type developer - # RPC: want-rpc-server #f rpc-server-endpoint http://localhost:8080/ diff --git a/deployment/public_client.prc b/deployment/public_client.prc index e3c03fe6..d6e68cd5 100644 --- a/deployment/public_client.prc +++ b/deployment/public_client.prc @@ -9,8 +9,6 @@ video-library-name p3ffmpeg want-dev #f preload-avatars #t -game-type remote - # Graphics: aux-display pandagl aux-display pandadx9 diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py index 72abea04..c0aa7b8d 100755 --- a/otp/distributed/OTPClientRepository.py +++ b/otp/distributed/OTPClientRepository.py @@ -469,7 +469,7 @@ class OTPClientRepository(ClientRepositoryBase): self.handler = self.handleMessageType messenger.send('connectionIssue') url = self.serverList[0] - self.notify.warning('Failed to connect to %s (%s %s). Notifying user.' % (config.GetString('TTS_GAMESERVER'), statusCode, statusString)) + self.notify.warning('Failed to connect to %s (%s %s). Notifying user.' % (url.cStr(), statusCode, statusString)) dialogClass = OTPGlobals.getGlobalDialogClass() self.failedToConnectBox = dialogClass(message=OTPLocalizer.CRNoConnectTryAgain % (url.getServer(), url.getPort()), doneEvent='failedToConnectAck', text_wordwrap=18, style=OTPDialog.TwoChoice) self.failedToConnectBox.show() diff --git a/resources b/resources index af09e769..4e298683 160000 --- a/resources +++ b/resources @@ -1 +1 @@ -Subproject commit af09e769b860512c03de6fff4a585e96d674e89b +Subproject commit 4e2986832f047ae4e8f6256d187a6d111a526f5d diff --git a/toontown/launcher/TTSLauncher.py b/toontown/launcher/TTSLauncher.py index dc7227d3..38886271 100755 --- a/toontown/launcher/TTSLauncher.py +++ b/toontown/launcher/TTSLauncher.py @@ -46,20 +46,7 @@ class TTSLauncher: return self.getValue('TTS_PLAYCOOKIE') def getGameServer(self): - if config.GetString('game-type', 'developer') != 'remote': - return self.getValue('TTS_GAMESERVER') - return self.getServer(self.getValue('TTS_GAMESERVER')) - - def getServer(self, gameserver): - import DNS - DNS.DiscoverNameServers() - srv_req = DNS.Request(qtype = 'srv') - srv_result = srv_req.req('_toontown._tcp.'+ gameserver) - - for result in srv_result.answers: - if result['typename'] == 'SRV': - data = result['data'] - return data[3] + ":" + str(data[2]) + return self.getValue('TTS_GAMESERVER') def getValue(self, key, default = None): return os.environ.get(key, default)