Merge branch 'develop' into friends

This commit is contained in:
John Cote 2021-07-21 14:32:34 -04:00
commit 8f2cf3604c
No known key found for this signature in database
GPG Key ID: E3442FF71E9C1C01
2 changed files with 4 additions and 4 deletions

View File

@ -43,9 +43,9 @@ builtins.game = game
from otp.ai.AIBaseGlobal import *
from toontown.ai.ToontownAIRepository import ToontownAIRepository
simbase.air = ToontownAIRepository(config.GetInt('air-base-channel', 1000000), config.GetInt('air-stateserver', 4002), config.GetString('district-name', 'Toon Valley'))
simbase.air = ToontownAIRepository(ConfigVariableInt('air-base-channel', 1000000).value, ConfigVariableInt('air-stateserver', 4002).value, ConfigVariableString('district-name', 'Toon Valley').value)
host = config.GetString('air-connect', '127.0.0.1:7199')
host = ConfigVariableString('air-connect', '127.0.0.1:7199').value
port = 7199
if ':' in host:
host, port = host.split(':', 1)

View File

@ -43,9 +43,9 @@ loadPrcFile('etc/Configrc.prc')
from otp.ai.AIBaseGlobal import *
from toontown.uberdog.ToontownUDRepository import ToontownUDRepository
simbase.air = ToontownUDRepository(config.GetInt('air-base-channel', 1000000), config.GetInt('air-stateserver', 4002))
simbase.air = ToontownUDRepository(ConfigVariableInt('air-base-channel', 1000000).value, ConfigVariableInt('air-stateserver', 4002).value)
host = config.GetString('air-connect', '127.0.0.1:7199')
host = ConfigVariableString('air-connect', '127.0.0.1:7199').value
port = 7199
if ':' in host:
host, port = host.split(':', 1)