Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of http://gitlab.com/toontown-unlimited/src

Browse source
This commit is contained in:
Daniel 2015-03-09 01:06:13 +02:00
commit 25bb468501
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
start_game.bat
View file

@ -5,7 +5,7 @@ set /P PPYTHON_PATH=<PPYTHON_PATH
echo Choose your game server!
echo #1 - Localhost
echo #2 - DenialMC
echo #3 - DenialMC Server
echo #3 - Development Server
echo #4 - Custom
echo #5 - Custom w/ RemoteDB
echo.

9
toontown/shtiker/ShardPage.py
View file

@ -541,11 +541,10 @@ class ShardPage(ShtikerPage.ShtikerPage):
self.shardButtons.append(buttonTuple[0])
setupInvasionMarker(buttonTuple[3], 1)
## if invasionStatus:
## setupInvasionMarker(buttonTuple[3], invasionStatus)
## else:
## removeInvasionMarker(buttonTuple[3])
if invasionStatus:
setupInvasionMarker(buttonTuple[3], invasionStatus)
else:
removeInvasionMarker(buttonTuple[3])
for shardId, buttonTuple in self.shardButtonMap.items():