RomanNum3ral
/
open-toontown
mirror of https://github.com/open-toontown/open-toontown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove remaining astron references

This commit is contained in:
Open Toontown 2022-01-20 18:00:08 -05:00
parent 58c277c20b
commit ca8adde0c3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
otp/distributed/OTPInternalRepository.py
View File

@ -1,20 +1,18 @@
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from direct.distributed.AstronInternalRepository import AstronInternalRepository from direct.distributed.ConnectionRepository import ConnectionRepository
from direct.distributed.PyDatagram import * from direct.distributed.PyDatagram import *
# TODO: Remove Astron dependence. class OTPInternalRepository(ConnectionRepository):
class OTPInternalRepository(AstronInternalRepository):
notify = DirectNotifyGlobal.directNotify.newCategory('OTPInternalRepository') notify = DirectNotifyGlobal.directNotify.newCategory('OTPInternalRepository')
dbId = 4003 dbId = 4003
def __init__(self, baseChannel, serverId, dcFileNames, dcSuffix, connectMethod, threadedNet): def __init__(self, baseChannel, serverId, dcFileNames, dcSuffix, connectMethod, threadedNet):
AstronInternalRepository.__init__(self, baseChannel, serverId=serverId, dcFileNames=dcFileNames, ConnectionRepository.__init__(self, baseChannel, serverId=serverId, dcFileNames=dcFileNames,
dcSuffix=dcSuffix, connectMethod=connectMethod, threadedNet=threadedNet) dcSuffix=dcSuffix, connectMethod=connectMethod, threadedNet=threadedNet)
def handleConnected(self): def handleConnected(self):
AstronInternalRepository.handleConnected(self) ConnectionRepository.handleConnected(self)
def getAccountIdFromSender(self): def getAccountIdFromSender(self):
return (self.getMsgSender() >> 32) & 0xFFFFFFFF return (self.getMsgSender() >> 32) & 0xFFFFFFFF

2
toontown/ai/AIStart.py
View File

@ -10,7 +10,7 @@ parser.add_argument('--stateserver', help='The control channel of this AI\'s des
parser.add_argument('--district-name', help='The name of the district on this AI server.') parser.add_argument('--district-name', help='The name of the district on this AI server.')
parser.add_argument('--messagedirector-ip', parser.add_argument('--messagedirector-ip',
help='The IP address of the Message Director that this AI will connect to.') help='The IP address of the Message Director that this AI will connect to.')
parser.add_argument('--eventlogger-ip', help='The IP address of the Astron Event Logger that this AI will log to.') parser.add_argument('--eventlogger-ip', help='The IP address of the OTP Event Logger that this AI will log to.')
parser.add_argument('config', nargs='*', default=['etc/Configrc.prc'], parser.add_argument('config', nargs='*', default=['etc/Configrc.prc'],
help='PRC file(s) that will be loaded on this AI instance.') help='PRC file(s) that will be loaded on this AI instance.')
args = parser.parse_args() args = parser.parse_args()

2
toontown/uberdog/UDStart.py
View File

@ -9,7 +9,7 @@ parser.add_argument('--max-channels', help='The number of channels that the serv
parser.add_argument('--stateserver', help='The control channel of this UberDOG\'s designated State Server.') parser.add_argument('--stateserver', help='The control channel of this UberDOG\'s designated State Server.')
parser.add_argument('--messagedirector-ip', parser.add_argument('--messagedirector-ip',
help='The IP address of the Message Director that this UberDOG will connect to.') help='The IP address of the Message Director that this UberDOG will connect to.')
parser.add_argument('--eventlogger-ip', help='The IP address of the Astron Event Logger that this UberDOG will log to.') parser.add_argument('--eventlogger-ip', help='The IP address of the OTP Event Logger that this UberDOG will log to.')
parser.add_argument('config', nargs='*', default=['etc/Configrc.prc'], parser.add_argument('config', nargs='*', default=['etc/Configrc.prc'],
help='PRC file(s) that will be loaded on this UberDOG instance.') help='PRC file(s) that will be loaded on this UberDOG instance.')
args = parser.parse_args() args = parser.parse_args()