Merge pull request #37 from loblao/master

oops.jpg
This commit is contained in:
Conspirator 2015-06-04 20:06:58 -04:00
commit 0628201fca
3 changed files with 12 additions and 4 deletions

View file

@ -7,6 +7,7 @@ echo.
echo #1 - Localhost
echo #2 - Dev Server
echo #3 - Custom
echo #4 - Local RemoteDB
echo.
:selection
@ -18,6 +19,8 @@ if %INPUT%==1 (
set TTS_GAMESERVER=127.0.0.1
) else if %INPUT%==2 (
set TTS_GAMESERVER=167.114.220.172
) else if %INPUT%==4 (
set TTS_GAMESERVER=127.0.0.1
) else if %INPUT%==3 (
echo.
set /P TTS_GAMESERVER=Gameserver:
@ -30,6 +33,9 @@ echo.
if %INPUT%==2 (
set /P ttsUsername="Username: "
set /P ttsPassword="Password: "
) else if %INPUT%==4 (
set /P ttsUsername="Username: "
set /P ttsPassword="Password: "
) else (
set /P TTS_PLAYCOOKIE=Username:
)
@ -53,6 +59,8 @@ cd ../../
if %INPUT%==2 (
"dependencies/panda/python/ppython.exe" -m toontown.toonbase.ClientStartRemoteDB
) else if %INPUT%==4 (
"dependencies/panda/python/ppython.exe" -m toontown.toonbase.ClientStartRemoteDB
) else (
"dependencies/panda/python/ppython.exe" -m toontown.toonbase.ClientStart
)

View file

@ -40,7 +40,7 @@ def entropyIdeal(length):
return -length * prob * math.log(prob) / math.log(2.0)
accountDBType = config.GetString('accountdb-type', 'developer')
accountServerSecret = config.GetString('account-server-secret', 'dev')
accountServerSecret = config.GetString('account-server-secret', '9sj6816aj1hs795j') # Changed in server distribution.
accountServerHashAlgo = config.GetString('account-server-hash-algo', 'sha512')
if accountDBType == 'remote':
if accountServerSecret == 'dev':