Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Upload batty's change to hide the gameserver IP, update astron."

Browse source 
This reverts commit 21b5edae04.
This commit is contained in:
Loudrob 2015-08-30 18:20:39 -04:00
parent 01da0e2393
commit 9f8a7e7519
7 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
dependencies/astron/astrond.exe vendored
View file

Binary file not shown.

BIN
dependencies/astron/mongoclient.dll vendored
View file

Binary file not shown.

2
dependencies/config/release/dev.prc vendored
View file

@ -25,8 +25,6 @@ accountdb-type developer
shard-low-pop 50 shard-low-pop 50
shard-mid-pop 100 shard-mid-pop 100
game-type developer
# RPC: # RPC:
want-rpc-server #f want-rpc-server #f
rpc-server-endpoint http://localhost:8080/ rpc-server-endpoint http://localhost:8080/

2
deployment/public_client.prc
View file

@ -9,8 +9,6 @@ video-library-name p3ffmpeg
want-dev #f want-dev #f
preload-avatars #t preload-avatars #t
game-type remote
# Graphics: # Graphics:
aux-display pandagl aux-display pandagl
aux-display pandadx9 aux-display pandadx9

2
otp/distributed/OTPClientRepository.py
View file

@ -469,7 +469,7 @@ class OTPClientRepository(ClientRepositoryBase):
self.handler = self.handleMessageType self.handler = self.handleMessageType
messenger.send('connectionIssue') messenger.send('connectionIssue')
url = self.serverList[0] 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() dialogClass = OTPGlobals.getGlobalDialogClass()
self.failedToConnectBox = dialogClass(message=OTPLocalizer.CRNoConnectTryAgain % (url.getServer(), url.getPort()), doneEvent='failedToConnectAck', text_wordwrap=18, style=OTPDialog.TwoChoice) self.failedToConnectBox = dialogClass(message=OTPLocalizer.CRNoConnectTryAgain % (url.getServer(), url.getPort()), doneEvent='failedToConnectAck', text_wordwrap=18, style=OTPDialog.TwoChoice)
self.failedToConnectBox.show() self.failedToConnectBox.show()

2
resources

@ -1 +1 @@
Subproject commit af09e769b860512c03de6fff4a585e96d674e89b Subproject commit 4e2986832f047ae4e8f6256d187a6d111a526f5d

15
toontown/launcher/TTSLauncher.py
View file

@ -46,20 +46,7 @@ class TTSLauncher:
return self.getValue('TTS_PLAYCOOKIE') return self.getValue('TTS_PLAYCOOKIE')
def getGameServer(self): def getGameServer(self):
if config.GetString('game-type', 'developer') != 'remote': return self.getValue('TTS_GAMESERVER')
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])
def getValue(self, key, default = None): def getValue(self, key, default = None):
return os.environ.get(key, default) return os.environ.get(key, default)